You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2018/12/08 00:04:28 UTC
svn commit: r1848428 - in /openoffice/trunk/main:
extras/source/templates/wizard/bitmap/webwizard.bmp
extras/source/templates/wizard/bitmap/webwizard.png
wizards/source/webwizard/HtmlAutoPilotBasic.xba
wizards/source/webwizard/Language.xba
Author: mseidel
Date: Sat Dec 8 00:04:28 2018
New Revision: 1848428
URL: http://svn.apache.org/viewvc?rev=1848428&view=rev
Log:
Cleaning up WebWizard, moving graphics from bmp to png
Added:
openoffice/trunk/main/extras/source/templates/wizard/bitmap/webwizard.png (with props)
Removed:
openoffice/trunk/main/extras/source/templates/wizard/bitmap/webwizard.bmp
Modified:
openoffice/trunk/main/wizards/source/webwizard/HtmlAutoPilotBasic.xba
openoffice/trunk/main/wizards/source/webwizard/Language.xba
Added: openoffice/trunk/main/extras/source/templates/wizard/bitmap/webwizard.png
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/extras/source/templates/wizard/bitmap/webwizard.png?rev=1848428&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/trunk/main/extras/source/templates/wizard/bitmap/webwizard.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Modified: openoffice/trunk/main/wizards/source/webwizard/HtmlAutoPilotBasic.xba
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/wizards/source/webwizard/HtmlAutoPilotBasic.xba?rev=1848428&r1=1848427&r2=1848428&view=diff
==============================================================================
--- openoffice/trunk/main/wizards/source/webwizard/HtmlAutoPilotBasic.xba (original)
+++ openoffice/trunk/main/wizards/source/webwizard/HtmlAutoPilotBasic.xba Sat Dec 8 00:04:28 2018
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -9,16 +9,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
***********************************************************-->
<script:module xmlns:script="http://openoffice.org/2000/script" script:name="HtmlAutoPilotBasic" script:language="StarBasic">' Variables must be declared
Option Explicit
@@ -174,10 +174,10 @@ Dim OldWebPageIndex as Integer
CurrentHome$ = GraphicsDir + Style(CurWebPageIndex, 4)
CurrentTop$ = GraphicsDir + Style(CurWebPageIndex, 5)
With oBaseDocument.DocumentProperties.UserDefinedProperties
- .AutoPilotName1 = ExtractGraphicNames(CurWebPageIndex,2)
- .AutoPilotName2 = ExtractGraphicNames(CurWebPageIndex, 4)
- .AutoPilotBullet = Style(CurWebPageIndex, 6)
- .AutoPilotBackground = Style(CurWebPageIndex, 7)
+ .AutoPilotName1 = ExtractGraphicNames(CurWebPageIndex,2)
+ .AutoPilotName2 = ExtractGraphicNames(CurWebPageIndex, 4)
+ .AutoPilotBullet = Style(CurWebPageIndex, 6)
+ .AutoPilotBackground = Style(CurWebPageIndex, 7)
End With
SetBulletAndGraphics()
CheckControls(oBaseDocument.DrawPage)
@@ -191,7 +191,7 @@ End Sub
Function ExtractGraphicNames(CurIndex as Integer, i as Integer) as String
Dim FieldValue as String
FieldValue = GetFileNameWithoutExtension(Style(CurIndex, i))
- FieldValue = FieldValue & " " & GetFileNameWithoutExtension(Style(CurIndex, i+1))
+ FieldValue = FieldValue & " " & GetFileNameWithoutExtension(Style(CurIndex, i+1))
ExtractGraphicNames = FieldValue
End Function
@@ -257,7 +257,7 @@ Dim oGraphic as Object
Dim i as Integer
Dim udProps as Object
Dim SavePath as String
- BasicLibraries.LoadLibrary("Tools")
+ BasicLibraries.LoadLibrary("Tools")
oUcb = createUnoService("com.sun.star.ucb.SimpleFileAccess")
GetWebWizardPaths()
oBaseDocument = ThisComponent
@@ -276,11 +276,11 @@ Dim SavePath as String
BulletUrlsToSavePath(SavePath)
- udProps = oBaseDocument.DocumentProperties.UserDefinedProperties
- udProps.addProperty("AutoPilotName1", 0, "")
- udProps.addProperty("AutoPilotName2", 0, "")
- udProps.addProperty("AutoPilotBullet", 0, "")
- udProps.addProperty("AutoPilotBackground", 0, "")
+ udProps = oBaseDocument.DocumentProperties.UserDefinedProperties
+ udProps.addProperty("AutoPilotName1", 0, "")
+ udProps.addProperty("AutoPilotName2", 0, "")
+ udProps.addProperty("AutoPilotBullet", 0, "")
+ udProps.addProperty("AutoPilotBackground", 0, "")
AttachBasicMacroToEvent(oBaseDocument,"OnSaveDone", "")
AttachBasicMacroToEvent(oBaseDocument,"OnSaveAsDone", "")
@@ -370,9 +370,9 @@ Dim sExtension as String
sFieldList() = ArrayoutofString(sField, " ", MaxIndex)
For s = 0 To MaxIndex
If m < 6 Then
- List(a,m) = sFieldList(s) & ".gif"
+ List(a,m) = sFieldList(s) & ".gif"
Else
- List(a,m) = sFieldList(s)
+ List(a,m) = sFieldList(s)
End If
m = m + 1
Next s
@@ -437,7 +437,7 @@ End Sub
Sub RepaintHeaderPreview()
Dim Bitmap As Object
Dim sBitmapPath as String
- sBitmapPath = SOBitmapPath & "webwizard.bmp"
+ sBitmapPath = SOBitmapPath & "webwizard.png"
WebWzrd.ImagePreview.ImageURL = sBitmapPath
End Sub
Modified: openoffice/trunk/main/wizards/source/webwizard/Language.xba
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/wizards/source/webwizard/Language.xba?rev=1848428&r1=1848427&r2=1848428&view=diff
==============================================================================
--- openoffice/trunk/main/wizards/source/webwizard/Language.xba (original)
+++ openoffice/trunk/main/wizards/source/webwizard/Language.xba Sat Dec 8 00:04:28 2018
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -9,16 +9,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
***********************************************************-->
<script:module xmlns:script="http://openoffice.org/2000/script" script:name="Language" script:language="StarBasic">Option Explicit
@@ -85,7 +85,7 @@ Sub OpenWebDialog()
.optArea.Label = GetResText(1008)
.chkSaveasTemplate.Label = GetResText(1010)
End With
-
+
BufferNames() = ArrayfromMultiArray(Layout, 1)
DialogModel.lbTemplate.StringItemList() = BufferNames()
DialogModel.lbTemplate.SelectedItems() = SelList()
@@ -94,7 +94,7 @@ Sub OpenWebDialog()
BufferNames() = ArrayfromMultiArray(Style, 1)
DialogModel.lbStyles.StringItemList() = BufferNames()
DialogModel.lbStyles.SelectedItems() = SelList()
- sBitmapPath = SOBitmapPath & "webwizard.bmp"
+ sBitmapPath = SOBitmapPath & "webwizard.png"
DialogModel.ImagePreview.ImageURL = sBitmapPath
ToggleOptionButtons(DialogModel, bWithBackGraphic)