LICENSE | 4 -
chart2/source/model/main/ChartModel.hxx | 2
dev/null |binary
editeng/source/misc/hangulhanja.cxx | 2
extensions/test/ole/MfcControl/StdAfx.h | 8 +-
extras/source/templates/wizard/bitmap/Import_1.png |binary
extras/source/templates/wizard/bitmap/Import_3.png |binary
extras/source/templates/wizard/bitmap/Import_4.png |binary
extras/source/templates/wizard/bitmap/MS-Import_2-1.png |binary
extras/source/templates/wizard/bitmap/MS-Import_2-2.png |binary
extras/source/templates/wizard/bitmap/MS-Import_2-3.png |binary
extras/source/templates/wizard/bitmap/XML-Import_2-1.png |binary
extras/source/templates/wizard/bitmap/XML-Import_2-2.png |binary
extras/source/templates/wizard/bitmap/XML-Import_2-3.png |binary
extras/source/templates/wizard/bitmap/XML-Import_2-4.png |binary
extras/source/templates/wizard/bitmap/euro_1.png |binary
extras/source/templates/wizard/bitmap/euro_2.png |binary
extras/source/templates/wizard/bitmap/euro_3.png |binary
forms/source/component/Edit.cxx | 2
readlicense_oo/docs/readme.xsl | 36 +++++------
svtools/source/brwbox/datwin.hxx | 2
vcl/source/window/brdwin.cxx | 2
vcl/source/window/dockingarea.cxx | 2
wizards/source/euro/AutoPilotRun.xba | 40 ++++++------
wizards/source/euro/DlgConvert.xdl | 2
wizards/source/euro/Init.xba | 48 +++++++--------
wizards/source/importwizard/Main.xba | 43 ++++++-------
27 files changed, 94 insertions(+), 99 deletions(-)
New commits:
commit ab017c683002df7f76a792e369c00fd10e1024f0
Author: Matthias Seidel <msei...@apache.org>
AuthorDate: Thu Nov 8 15:58:53 2018 +0000
Commit: Matthias Seidel <msei...@apache.org>
CommitDate: Thu Nov 8 15:58:53 2018 +0000
Cleaning up Document Converter wizard, moving graphics from bmp to png
diff --git a/extras/source/templates/wizard/bitmap/Import_1.bmp
b/extras/source/templates/wizard/bitmap/Import_1.bmp
deleted file mode 100644
index 98457094b3fd..000000000000
Binary files a/extras/source/templates/wizard/bitmap/Import_1.bmp and /dev/null
differ
diff --git a/extras/source/templates/wizard/bitmap/Import_1.png
b/extras/source/templates/wizard/bitmap/Import_1.png
new file mode 100644
index 000000000000..ea0942103e6a
Binary files /dev/null and b/extras/source/templates/wizard/bitmap/Import_1.png
differ
diff --git a/extras/source/templates/wizard/bitmap/Import_3.bmp
b/extras/source/templates/wizard/bitmap/Import_3.bmp
deleted file mode 100644
index 37802a50d744..000000000000
Binary files a/extras/source/templates/wizard/bitmap/Import_3.bmp and /dev/null
differ
diff --git a/extras/source/templates/wizard/bitmap/Import_3.png
b/extras/source/templates/wizard/bitmap/Import_3.png
new file mode 100644
index 000000000000..abffeb3b9a1d
Binary files /dev/null and b/extras/source/templates/wizard/bitmap/Import_3.png
differ
diff --git a/extras/source/templates/wizard/bitmap/Import_4.bmp
b/extras/source/templates/wizard/bitmap/Import_4.bmp
deleted file mode 100644
index 591c5ded5065..000000000000
Binary files a/extras/source/templates/wizard/bitmap/Import_4.bmp and /dev/null
differ
diff --git a/extras/source/templates/wizard/bitmap/Import_4.png
b/extras/source/templates/wizard/bitmap/Import_4.png
new file mode 100644
index 000000000000..6529f8e84871
Binary files /dev/null and b/extras/source/templates/wizard/bitmap/Import_4.png
differ
diff --git a/extras/source/templates/wizard/bitmap/MS-Import_2-1.bmp
b/extras/source/templates/wizard/bitmap/MS-Import_2-1.bmp
deleted file mode 100644
index 085feeca5ab8..000000000000
Binary files a/extras/source/templates/wizard/bitmap/MS-Import_2-1.bmp and
/dev/null differ
diff --git a/extras/source/templates/wizard/bitmap/MS-Import_2-1.png
b/extras/source/templates/wizard/bitmap/MS-Import_2-1.png
new file mode 100644
index 000000000000..51da77a51f7d
Binary files /dev/null and
b/extras/source/templates/wizard/bitmap/MS-Import_2-1.png differ
diff --git a/extras/source/templates/wizard/bitmap/MS-Import_2-2.bmp
b/extras/source/templates/wizard/bitmap/MS-Import_2-2.bmp
deleted file mode 100644
index 64fc93f1a579..000000000000
Binary files a/extras/source/templates/wizard/bitmap/MS-Import_2-2.bmp and
/dev/null differ
diff --git a/extras/source/templates/wizard/bitmap/MS-Import_2-2.png
b/extras/source/templates/wizard/bitmap/MS-Import_2-2.png
new file mode 100644
index 000000000000..ef03f14b8a3a
Binary files /dev/null and
b/extras/source/templates/wizard/bitmap/MS-Import_2-2.png differ
diff --git a/extras/source/templates/wizard/bitmap/MS-Import_2-3.bmp
b/extras/source/templates/wizard/bitmap/MS-Import_2-3.bmp
deleted file mode 100644
index c8fc6becc718..000000000000
Binary files a/extras/source/templates/wizard/bitmap/MS-Import_2-3.bmp and
/dev/null differ
diff --git a/extras/source/templates/wizard/bitmap/MS-Import_2-3.png
b/extras/source/templates/wizard/bitmap/MS-Import_2-3.png
new file mode 100644
index 000000000000..22540a46c35f
Binary files /dev/null and
b/extras/source/templates/wizard/bitmap/MS-Import_2-3.png differ
diff --git a/extras/source/templates/wizard/bitmap/XML-Import_2-1.bmp
b/extras/source/templates/wizard/bitmap/XML-Import_2-1.bmp
deleted file mode 100644
index 95f843d6891f..000000000000
Binary files a/extras/source/templates/wizard/bitmap/XML-Import_2-1.bmp and
/dev/null differ
diff --git a/extras/source/templates/wizard/bitmap/XML-Import_2-1.png
b/extras/source/templates/wizard/bitmap/XML-Import_2-1.png
new file mode 100644
index 000000000000..2ff4333b5b4d
Binary files /dev/null and
b/extras/source/templates/wizard/bitmap/XML-Import_2-1.png differ
diff --git a/extras/source/templates/wizard/bitmap/XML-Import_2-2.bmp
b/extras/source/templates/wizard/bitmap/XML-Import_2-2.bmp
deleted file mode 100644
index 0ba9ed8d61ac..000000000000
Binary files a/extras/source/templates/wizard/bitmap/XML-Import_2-2.bmp and
/dev/null differ
diff --git a/extras/source/templates/wizard/bitmap/XML-Import_2-2.png
b/extras/source/templates/wizard/bitmap/XML-Import_2-2.png
new file mode 100644
index 000000000000..a87f2ec3a49b
Binary files /dev/null and
b/extras/source/templates/wizard/bitmap/XML-Import_2-2.png differ
diff --git a/extras/source/templates/wizard/bitmap/XML-Import_2-3.bmp
b/extras/source/templates/wizard/bitmap/XML-Import_2-3.bmp
deleted file mode 100644
index 93aaf167e9e8..000000000000
Binary files a/extras/source/templates/wizard/bitmap/XML-Import_2-3.bmp and
/dev/null differ
diff --git a/extras/source/templates/wizard/bitmap/XML-Import_2-3.png
b/extras/source/templates/wizard/bitmap/XML-Import_2-3.png
new file mode 100644
index 000000000000..a8231ef4a0a2
Binary files /dev/null and
b/extras/source/templates/wizard/bitmap/XML-Import_2-3.png differ
diff --git a/extras/source/templates/wizard/bitmap/XML-Import_2-4.bmp
b/extras/source/templates/wizard/bitmap/XML-Import_2-4.bmp
deleted file mode 100644
index 7e18ccfe2531..000000000000
Binary files a/extras/source/templates/wizard/bitmap/XML-Import_2-4.bmp and
/dev/null differ
diff --git a/extras/source/templates/wizard/bitmap/XML-Import_2-4.png
b/extras/source/templates/wizard/bitmap/XML-Import_2-4.png
new file mode 100644
index 000000000000..c68842e01e24
Binary files /dev/null and
b/extras/source/templates/wizard/bitmap/XML-Import_2-4.png differ
diff --git a/wizards/source/importwizard/Main.xba
b/wizards/source/importwizard/Main.xba
index 24bf68688dec..cbadb8e7cff9 100644
--- a/wizards/source/importwizard/Main.xba
+++ b/wizards/source/importwizard/Main.xba
@@ -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,20 +9,20 @@
* 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="Main" script:language="StarBasic">Option Explicit
+REM ***** BASIC *****
-' ***** BASIC *****
Public HeaderPreviews(4) as Object
Public ImportDialog as Object
Public ImportDialogArea as Object
@@ -50,8 +50,8 @@ Sub Main()
If GetImportWizardPaths() = False Then
Exit Sub
End If
- bCancelTask = False
- bDoKeepApplValues = False
+ bCancelTask = False
+ bDoKeepApplValues = False
CurOffice = 0
ImportDialogArea =
LoadDialog("ImportWizard","ImportDialog")
ImportDialog = ImportDialogArea.Model
@@ -60,12 +60,12 @@ Sub Main()
MaxApplCount = 4
FillStep_Welcome()
RepaintHeaderPreview()
- ImportDialog.ImportPreview.BackGroundColor = RGB(0,60,126)
+ ImportDialog.ImportPreview.BackGroundColor = RGB(0,60,126)
ImportDialog.cmdGoOn.DefaultButton = True
ImportDialogArea.GetControl("optSODocuments").SetFocus()
ToggleCheckboxesWithBoolean(False)
RetValue = ImportDialogArea.Execute()
- If bShowLogFile=TRUE Then
+ If bShowLogFile=TRUE Then
OpenDocument(sLogUrl, NoArgs())
End if
If RetValue = 0 Then
@@ -79,7 +79,6 @@ RTError:
End Sub
-
Sub NextStep()
Dim iCurStep as Integer
If Not bDebugWizard Then
@@ -116,15 +115,14 @@ Dim iCurStep as Integer
If ((ImportDialog.chkLogfile.State <> 1) OR (iCurStep <>
3)) Then
ImportDialog.cmdGoOn.DefaultButton = True
End If
-
- RepaintHeaderPreview()
+
+ RepaintHeaderPreview()
Exit Sub
RTError:
Msgbox sRTErrorDesc, 16, sRTErrorHeader
End Sub
-
Sub PrevStep()
Dim iCurStep as Integer
If Not bDebugWizard Then
@@ -149,14 +147,13 @@ Dim iCurStep as Integer
End If
End Select
ImportDialog.cmdGoOn.DefaultButton = True
- RepaintHeaderPreview()
+ RepaintHeaderPreview()
Exit Sub
RTError:
Msgbox sRTErrorDesc, 16, sRTErrorHeader
End Sub
-
Sub CancelTask()
If bConversionIsRunning Then
If Msgbox(sConvertError1, 36, sConvertError2) = 6 Then
@@ -186,9 +183,9 @@ Dim LocPrefix as String
LocPrefix = WizardMode
LocPrefix = ReplaceString(LocPrefix,"XML", "SO")
If CurStep = 2 Then
- sBitmapPath = SOBitmapPath & LocPrefix &
"-Import_" & CurStep & "-" &
Applications(CurOffice,SBAPPLKEY) + 1 & ".bmp"
+ sBitmapPath = SOBitmapPath & LocPrefix &
"-Import_" & CurStep & "-" &
Applications(CurOffice,SBAPPLKEY) + 1 & ".png"
Else
- sBitmapPath = SOBitmapPath & "Import_" &
CurStep & ".bmp"
+ sBitmapPath = SOBitmapPath & "Import_" &
CurStep & ".png"
End If
ImportDialog.ImportPreview.ImageURL = sBitmapPath
End Sub
@@ -206,7 +203,7 @@ Function CheckInstalledModule(Index as Integer) as Boolean
Dim ModuleName as String
Dim NameList() as String
Dim MaxIndex as Integer
-Dim i as Integer
+Dim i as Integer
ModuleName = ModuleList(Index)
If Instr(1,ModuleName,"/") <> 0 Then
CheckInstalledModule() = False
@@ -263,9 +260,9 @@ Dim i as Integer
Case 1
With ImportDialog
If .optMSDocuments.State = 1 Then
- bDoEnable = .chkMSApplication1.State = 1 Or
.chkMSApplication2.State = 1 Or .chkMSApplication3.State = 1
+ bDoEnable = .chkMSApplication1.State =
1 Or .chkMSApplication2.State = 1 Or .chkMSApplication3.State = 1
Else
- bDoEnable = .chkSOApplication1.State = 1 Or
.chkSOApplication2.State = 1 Or .chkSOApplication3.State = 1 Or
.chkSOApplication4.State = 1
+ bDoEnable = .chkSOApplication1.State =
1 Or .chkSOApplication2.State = 1 Or .chkSOApplication3.State = 1 Or
.chkSOApplication4.State = 1
End If
End With
bDoKeepApplValues = False
@@ -277,14 +274,14 @@ Dim i as Integer
End Sub
-Sub TakeOverPathSettings()
+Sub TakeOverPathSettings()
'Takes over the Pathsettings from the first selected application to the
next applications
If Applications(CurOffice,SBDOCSOURCE) = "" Then
Applications(CurOffice,SBDOCSOURCE) =
Applications(0,SBDOCSOURCE)
Applications(CurOffice,SBDOCTARGET) =
Applications(0,SBDOCTARGET)
If WizardMode = SBXMLMODE AND Applications(CurOffice,SBAPPLKEY)
= 3 Then
Applications(CurOffice,SBTEMPLSOURCE) =
Applications(CurOffice,SBDOCSOURCE)
- Applications(CurOffice,SBTEMPLTARGET) =
Applications(CurOffice,SBDOCTARGET)
+ Applications(CurOffice,SBTEMPLTARGET) =
Applications(CurOffice,SBDOCTARGET)
Else
Applications(CurOffice,SBTEMPLSOURCE) =
Applications(0,SBTEMPLSOURCE)
Applications(CurOffice,SBTEMPLTARGET) =
Applications(0,SBTEMPLTARGET)
@@ -304,7 +301,7 @@ Function GetImportWizardPaths() as Boolean
Exit Function
End If
End If
- End If
+ End If
GetImportWizardPaths() = False
End Function
</script:module>
commit 3106f8d4ffacec335d9987e4df6ed4f2978fcdca
Author: Matthias Seidel <msei...@apache.org>
AuthorDate: Thu Nov 8 15:26:39 2018 +0000
Commit: Matthias Seidel <msei...@apache.org>
CommitDate: Thu Nov 8 15:26:39 2018 +0000
Removed whitespace
diff --git a/readlicense_oo/docs/readme.xsl b/readlicense_oo/docs/readme.xsl
index 3be95373a63b..d68af653748c 100644
--- a/readlicense_oo/docs/readme.xsl
+++ b/readlicense_oo/docs/readme.xsl
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--***********************************************************
- *
+ *
* 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
@@ -8,16 +8,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.
- *
+ *
***********************************************************-->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0">
@@ -33,7 +33,7 @@
<xsl:param name="type"/>
<xsl:param name="file"/>
<xsl:strip-space elements="*"/>
-
+
<xsl:param name="platform">
<xsl:if test="$os1='LINUX'">
<xsl:value-of select="'LINUX'"/>
@@ -53,33 +53,33 @@
<xsl:value-of select="'MAC'"/>
</xsl:if>
</xsl:param>
-
+
<xsl:param name="lf">
<xsl:choose>
<xsl:when
test="$platform='WIN'"><xsl:text>
</xsl:text></xsl:when>
<xsl:otherwise><xsl:text>
</xsl:text></xsl:otherwise>
</xsl:choose>
</xsl:param>
-
+
<xsl:template match="/">
<xsl:choose>
<xsl:when test="$type='html'">
-
+
<xsl:document method="html" href="{$file}"
doctype-public="-//W3C//DTD HTML 3.2//EN">
<xsl:apply-templates mode="html"/>
</xsl:document>
-
+
</xsl:when>
<xsl:when test="$type='text'">
-
+
<xsl:document method="text" href="{$file}">
<xsl:call-template name="textout" />
</xsl:document>
-
+
</xsl:when>
</xsl:choose>
</xsl:template>
-
+
<xsl:template match="*" mode="html">
<xsl:choose>
<xsl:when test="(contains(@class,$platform) or
not(@class) or (name(.)='p'))">
@@ -105,15 +105,15 @@
</xsl:if>
</xsl:when>
<xsl:otherwise>
-
+
</xsl:otherwise>
</xsl:choose>
</xsl:template>
-
+
<xsl:template name="textout">
<xsl:apply-templates />
</xsl:template>
-
+
<xsl:template match="*">
<xsl:if test="(@xml:lang=$lang1 or not(@xml:lang))"> <!-- check
for correct language -->
<xsl:choose>
@@ -125,7 +125,7 @@
</xsl:when>
<xsl:when test="name(.)='hr'">
<xsl:text>
-
+
----------------------------------------------------------------------------------------------------------
</xsl:text>
@@ -161,11 +161,11 @@
</xsl:when>
<xsl:when test="name(.)='h1'">
<xsl:value-of select="$lf"/>
-
<xsl:text>==================================================================</xsl:text>
+
<xsl:text>===================================================================</xsl:text>
<xsl:value-of select="$lf"/>
<xsl:apply-templates/>
<xsl:value-of select="$lf"/>
-
<xsl:text>==================================================================</xsl:text>
+
<xsl:text>===================================================================</xsl:text>
<xsl:value-of select="$lf"/>
</xsl:when>
<xsl:when test="name(.)='h2'">
commit 7364f1749a8e25959aa580d7a4c2bc710a52ccbe
Author: Matthias Seidel <msei...@apache.org>
AuthorDate: Thu Nov 8 15:06:51 2018 +0000
Commit: Matthias Seidel <msei...@apache.org>
CommitDate: Thu Nov 8 15:06:51 2018 +0000
Cleaning up Euro Converter wizard, moving graphics from bmp to png
diff --git a/extras/source/templates/wizard/bitmap/euro_1.bmp
b/extras/source/templates/wizard/bitmap/euro_1.bmp
deleted file mode 100644
index 81869151541f..000000000000
Binary files a/extras/source/templates/wizard/bitmap/euro_1.bmp and /dev/null
differ
diff --git a/extras/source/templates/wizard/bitmap/euro_1.png
b/extras/source/templates/wizard/bitmap/euro_1.png
new file mode 100644
index 000000000000..38a68c0a0caa
Binary files /dev/null and b/extras/source/templates/wizard/bitmap/euro_1.png
differ
diff --git a/extras/source/templates/wizard/bitmap/euro_2.bmp
b/extras/source/templates/wizard/bitmap/euro_2.bmp
deleted file mode 100644
index 34031d9efdda..000000000000
Binary files a/extras/source/templates/wizard/bitmap/euro_2.bmp and /dev/null
differ
diff --git a/extras/source/templates/wizard/bitmap/euro_2.png
b/extras/source/templates/wizard/bitmap/euro_2.png
new file mode 100644
index 000000000000..cc066dae2f52
Binary files /dev/null and b/extras/source/templates/wizard/bitmap/euro_2.png
differ
diff --git a/extras/source/templates/wizard/bitmap/euro_3.bmp
b/extras/source/templates/wizard/bitmap/euro_3.bmp
deleted file mode 100644
index 70f73b141d67..000000000000
Binary files a/extras/source/templates/wizard/bitmap/euro_3.bmp and /dev/null
differ
diff --git a/extras/source/templates/wizard/bitmap/euro_3.png
b/extras/source/templates/wizard/bitmap/euro_3.png
new file mode 100644
index 000000000000..bf544d2f61e1
Binary files /dev/null and b/extras/source/templates/wizard/bitmap/euro_3.png
differ
diff --git a/wizards/source/euro/AutoPilotRun.xba
b/wizards/source/euro/AutoPilotRun.xba
index 20b51c9a5631..8e1fa4884ddc 100644
--- a/wizards/source/euro/AutoPilotRun.xba
+++ b/wizards/source/euro/AutoPilotRun.xba
@@ -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="AutoPilotRun" script:language="StarBasic">Option Explicit
@@ -54,7 +54,7 @@ Dim oFactoryKey as Object
InitializeConverter(oLocale, 2)
ToggleGoOnButton()
oFactoryKey =
GetRegistryKeyContent("org.openoffice.Setup/Office/Factories")
- DialogModel.chkTextDocuments.Enabled =
oFactoryKey.hasbyName("com.sun.star.text.TextDocument")
+ DialogModel.chkTextDocuments.Enabled =
oFactoryKey.hasbyName("com.sun.star.text.TextDocument")
DialogModel.cmdGoOn.DefaultButton = True
DialogModel.lstCurrencies.TabIndex = 12
DialogConvert.GetControl("optWholeDir").SetFocus()
@@ -147,7 +147,7 @@ Dim sExtension as String
bIsReadOnly = False
RetrieveDocumentObjects()
sViewPath = CutPathView(SourceFile, 60)
- DialogModel.lblCurDocument.Label =
Str(DocIndex+1) & "/" & sTotDocCount & " ("
& sViewPath & ")"
+ DialogModel.lblCurDocument.Label =
Str(DocIndex+1) & "/" & sTotDocCount & " ("
& sViewPath & ")"
End If
InitializeDocument() = Not bIsReadOnly
Else
@@ -246,7 +246,7 @@ Dim TextBoxText as String
TextBoxText = TextBoxText &
DeleteStr(sInclusiveSubDir,"~") & chr(13)
End If
Else
- TextBoxText = sSOURCEFILE & " " &
ConvertFromUrl(Source) & chr(13)
+ TextBoxText = sSOURCEFILE & " " &
ConvertFromUrl(Source) & chr(13)
End If
TextBoxText = TextBoxText & sTARGETDIR & " "
& ConvertFromUrl(TargetDir) & chr(13)
If DialogModel.chkProtect.State = 1 Then
@@ -254,8 +254,8 @@ Dim TextBoxText as String
End If
DialogModel.txtConfig.Text = TextBoxText
ToggleProgressStep()
- DialogModel.cmdGoOn.Enabled = False
- InitializeThirdStep() = True
+ DialogModel.cmdGoOn.Enabled = False
+ InitializeThirdStep() = True
Else
InitializeThirdStep() = False
End If
@@ -276,7 +276,7 @@ Dim LocStep as Integer
DialogConvert.GetControl("lstCurrencies").Visible = Not
bMakeVisible
DialogConvert.GetControl("cmdBack").Visible = bMakeVisible
DialogConvert.GetControl("cmdGoOn").Visible = bMakeVisible
- DialogModel.imgPreview.ImageUrl = BitmapDir & "euro_"
& DialogModel.Step & ".bmp"
+ DialogModel.imgPreview.ImageUrl = BitmapDir & "euro_"
& DialogModel.Step & ".png"
End Sub
@@ -330,8 +330,8 @@ Dim sNoDirMessage as String
If DialogModel.chkTextDocuments.State = 1 Then
If (Instr(1, sLocMimeType,
"text") = 0) And (Instr(1, sLocMimeType, "calc") = 0) Then
Msgbox(sMsgFileInvalid, 48,
sMsgDLGTITLE)
- bIsValid = False
- End If
+ bIsValid = False
+ End If
Else
If (Instr(1, sLocMimeType,
"spreadsheet") = 0) And (Instr(1, sLocMimeType, "calc")) =
0 Then
Msgbox(sMsgFileInvalid, 48,
sMsgDLGTITLE)
@@ -350,7 +350,7 @@ Dim sNoDirMessage as String
End If
End if
Else
- Msgbox(HeaderString & " '" &
ConvertFromUrl(sPath) & "' " & sMsgNOTTHERE,48,
sMsgDLGTITLE)
+ Msgbox(HeaderString & " '" &
ConvertFromUrl(sPath) & "' " & sMsgNOTTHERE,48,
sMsgDLGTITLE)
End If
If bIsValid Then
AssignFileName() = sPath
@@ -361,7 +361,7 @@ End Function
Sub ToggleGoOnButton()
-Dim bDoEnable as Boolean
+Dim bDoEnable as Boolean
Dim sLocMimeType as String
Dim sPath as String
bDoEnable = Ubound(DialogModel.lstCurrencies.SelectedItems()) > -1
@@ -376,7 +376,7 @@ End Sub
Sub CallFolderPicker()
GetFolderName(DialogModel.txtTarget)
- ToggleGoOnButton()
+ ToggleGoOnButton()
End Sub
@@ -385,7 +385,7 @@ Sub CallFilePicker()
Dim oMasterKey as Object
Dim oTypes() as Object
Dim oUIKey() as Object
-
+
oMasterKey =
GetRegistryKeyContent("org.openoffice.TypeDetection.Types")
oTypes() = oMasterKey.Types
oUIKey =
GetRegistryKeyContent("org.openoffice.Office.UI/FilterClassification/LocalFilters")
@@ -406,7 +406,7 @@ Sub CallFilePicker()
Else
ReDim FilterNames(5,1) as String
End If
- FilterNames(0,0) =
oTypes.GetByName("calc_StarOffice_XML_Calc").UIName
+ FilterNames(0,0) =
oTypes.GetByName("calc_StarOffice_XML_Calc").UIName
Filternames(0,1) = "*.sxc"
FilterNames(1,0) =
oTypes.GetByName("calc_StarOffice_XML_Calc_Template").UIName
Filternames(1,1) = "*.stc"
@@ -414,9 +414,9 @@ Sub CallFilePicker()
FilterNames(2,1) = "*.sdc"
FilterNames(3,0) =
oUIKey.Classes.GetByName("sc345templ").DisplayName
Filternames(3,1) = "*.vor"
- FilterNames(4,0) = oTypes.GetByName("calc8").UIName
+ FilterNames(4,0) = oTypes.GetByName("calc8").UIName
Filternames(4,1) = "*.ods"
- FilterNames(5,0) =
oTypes.GetByName("calc8_template").UIName
+ FilterNames(5,0) =
oTypes.GetByName("calc8_template").UIName
Filternames(5,1) = "*.ots"
GetFileName(DialogModel.txtSource, Filternames())
Else
@@ -428,7 +428,7 @@ End Sub
Sub PreviousStep()
DialogModel.Step = 2
- DialogModel.cmdGoOn.Label = sGOON
+ DialogModel.cmdGoOn.Label = sGOON
DialogModel.cmdCancel.Label = sCANCEL
End Sub
</script:module>
diff --git a/wizards/source/euro/DlgConvert.xdl
b/wizards/source/euro/DlgConvert.xdl
index d633edaace72..c76df2747e13 100644
--- a/wizards/source/euro/DlgConvert.xdl
+++ b/wizards/source/euro/DlgConvert.xdl
@@ -77,7 +77,7 @@
<dlg:text dlg:id="lblRetrieval" dlg:tab-index="24" dlg:left="9"
dlg:top="119" dlg:width="216" dlg:height="8" dlg:page="3"
dlg:value="lblRetrieval"/>
<dlg:text dlg:id="lblConfig" dlg:tab-index="25" dlg:left="6" dlg:top="39"
dlg:width="94" dlg:height="8" dlg:page="3" dlg:value="lblConfig"/>
<dlg:text dlg:id="lblCurDocument" dlg:tab-index="26" dlg:left="16"
dlg:top="141" dlg:width="208" dlg:height="8" dlg:page="3"/>
- <dlg:img dlg:id="imgPreview" dlg:tab-index="27" dlg:left="6" dlg:top="6"
dlg:width="258" dlg:height="26"
dlg:src="file:///D:/office630np/share/template/german/wizard/bitmap/euro_2.bmp"/>
+ <dlg:img dlg:id="imgPreview" dlg:tab-index="27" dlg:left="6" dlg:top="6"
dlg:width="258" dlg:height="26"
dlg:src="file:///D:/office630np/share/template/german/wizard/bitmap/euro_2.png"/>
<dlg:fixedline dlg:id="hlnSelection" dlg:tab-index="28" dlg:left="7"
dlg:top="72" dlg:width="258" dlg:height="8" dlg:page="1"
dlg:value="hlnSelection"/>
<dlg:fixedline dlg:id="hlnExtent" dlg:tab-index="29" dlg:left="6"
dlg:top="39" dlg:width="156" dlg:height="8" dlg:page="2" dlg:value="hlnExtent"/>
<dlg:fixedline dlg:id="hlnProgress" dlg:tab-index="30" dlg:left="6"
dlg:top="108" dlg:width="258" dlg:height="8" dlg:page="3"
dlg:value="hlnProgress"/>
diff --git a/wizards/source/euro/Init.xba b/wizards/source/euro/Init.xba
index 1e0884c1fafa..0a3e428e6608 100644
--- a/wizards/source/euro/Init.xba
+++ b/wizards/source/euro/Init.xba
@@ -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,21 +9,19 @@
* 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="Init" script:language="StarBasic">Option Explicit
-REM ***** BASIC *****
-
-
+REM ***** BASIC *****
Public Const SBRANGEUBOUND = 20
Public StyleRangeAssignmentList(SBRANGEUBOUND)as String
@@ -217,13 +215,13 @@ Dim LocWorkPath as String
sCurrSLOVAK = GetResText(1515)
sCurrUNKNOWN = GetResText(1516)
sCurrSYSUNKNOWN = GetResText(1517)
- .cmdCancel.Label = sCANCEL
- .cmdHelp.Label = sHELP
- .cmdBack.Label = GetResText(1002)
- .cmdGoOn.Label = sGOON
- .lblHint.Label = GetResText(1004)
+ .cmdCancel.Label = sCANCEL
+ .cmdHelp.Label = sHELP
+ .cmdBack.Label = GetResText(1002)
+ .cmdGoOn.Label = sGOON
+ .lblHint.Label = GetResText(1004)
.lblCurrencies.Label = GetResText(1006)
- .cmdBack.Enabled = False
+ .cmdBack.Enabled = False
If .Step = 1 Then
.chkComplete.Label = GetResText(1100)
.hlnSelection.Label = GetResText(1101)
@@ -236,10 +234,10 @@ Dim LocWorkPath as String
Else
.lblProgress.Label = sStsPROGRESS
.hlnExtent.Label = GetResText(1200)
- .optSingleFile.Label = GetResText(1201)
+ .optSingleFile.Label = GetResText(1201)
.optWholeDir.Label = GetResText(1202)
.chkProtect.Label = GetResText(1207)
- .chkTextDocuments.Label = GetResText(1210)
+ .chkTextDocuments.Label = GetResText(1210)
sSOURCEFILE = GetResText(1203)
sSOURCEDIR = GetResText(1204)
@@ -247,8 +245,8 @@ Dim LocWorkPath as String
sInclusiveSubDir = GetResText(1205)
.chkRecursive.Label = sInclusiveSubDir
sTARGETDIR = GetResText(1206)
- .lblTarget.Label = STARGETDIR
-
+ .lblTarget.Label = STARGETDIR
+
LocWorkPath = GetPathSettings("Work")
If Not oUcb.Exists(LocWorkPath) Then
ShowNoOfficePathError()
@@ -256,7 +254,7 @@ Dim LocWorkPath as String
End If
.txtSource.Text = ConvertfromUrl(LocWorkPath)
-
+
SubstDir = .txtSource.Text
.txtTarget.Text = .txtSource.Text
.hlnProgress.Label = GetResText(1600)
@@ -290,7 +288,7 @@ Sub InitializeLanguages()
LangIDValue(3,0,0) = "es"
LangIDValue(3,0,1) = ""
LangIDValue(3,0,2) = "-40A"
-
+
'Spanish modern
LangIDValue(3,1,0) = "es"
LangIDValue(3,1,1) = ""
@@ -333,7 +331,7 @@ Sub InitializeLanguages()
LangIDValue(8,0,0) = "fr"
LangIDValue(8,0,1) = "LU"
LangIDValue(8,0,2) = "-140C"
-
+
LangIDValue(8,1,0) = "de"
LangIDValue(8,1,1) = "LU"
LangIDValue(8,1,2) = "-1007"
@@ -544,7 +542,7 @@ Sub InitializeControls()
EnableStep2DialogControls(True)
End If
End If
-End Sub
+End Sub
Sub InitializeConverter(oLocale, iDialogPage as Integer)
@@ -558,7 +556,7 @@ Dim Isthere as Boolean
If sDocType = "sCalc" Then
bDocHasProtectedSheets = CheckSheetProtection(oSheets)
End If
- oStatusline =
ThisComponent.GetCurrentController.GetFrame.CreateStatusIndicator()
+ oStatusline =
ThisComponent.GetCurrentController.GetFrame.CreateStatusIndicator()
End If
DialogConvert = LoadDialog("Euro", "DlgConvert")
DialogModel = DialogConvert.Model
@@ -575,9 +573,9 @@ Dim Isthere as Boolean
Stop
End If
FillUpCurrencyListbox()
- DialogModel.imgPreview.ImageUrl = BitmapDir & "euro_"
& DialogModel.Step & ".bmp"
+ DialogModel.imgPreview.ImageUrl = BitmapDir & "euro_"
& DialogModel.Step & ".png"
DialogConvert.Title = sMsgDLGTITLE
- DialogModel.cmdGoOn.DefaultButton = True
+ DialogModel.cmdGoOn.DefaultButton = True
If iDialogPage = 1 Then
ToggleWindow(True)
End If
@@ -592,7 +590,7 @@ Sub InitializeCurrencyValues(CurrIndex)
CurrSymbolList(1) = CurrValue(CurrIndex,4)
CurrSymbolList(2) = CurrValue(CurrIndex,5)
End If
-End Sub
+End Sub
Function InitializeLocales(oLocale) as Boolean
commit cb4c0a6aedab043527ecc5f35d9736e5f820bc68
Author: Matthias Seidel <msei...@apache.org>
AuthorDate: Wed Nov 7 16:57:16 2018 +0000
Commit: Matthias Seidel <msei...@apache.org>
CommitDate: Wed Nov 7 16:57:16 2018 +0000
Shortened ASCII art to avoid line break on Windows
diff --git a/LICENSE b/LICENSE
index 9e1e938b2b00..a3351894d368 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1222,7 +1222,7 @@ please contact openssl-c...@openssl.org.
OpenSSL License
---------------
-====================================================================
+===================================================================
Copyright (c) 1998-2016 The OpenSSL Project. All rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -1268,7 +1268,7 @@ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT,
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================
+===================================================================
This product includes cryptographic software written by Eric Young
(e...@cryptsoft.com). This product includes software written by Tim
commit 6b8c2c2298d68ad290a68aab7b3d1f8939f3c474
Author: Matthias Seidel <msei...@apache.org>
AuthorDate: Wed Nov 7 16:16:22 2018 +0000
Commit: Matthias Seidel <msei...@apache.org>
CommitDate: Wed Nov 7 16:16:22 2018 +0000
Fixed typo, deleted whitespace
diff --git a/extensions/test/ole/MfcControl/StdAfx.h
b/extensions/test/ole/MfcControl/StdAfx.h
index 2c56f0bef2cc..5304fa9cf714 100644
--- a/extensions/test/ole/MfcControl/StdAfx.h
+++ b/extensions/test/ole/MfcControl/StdAfx.h
@@ -27,20 +27,20 @@
#endif // _MSC_VER > 1000
// stdafx.h : include file for standard system include files,
-// or project specific include files that are used frequently,
-// but are changed infrequently
+// or project specific include files that are used frequently,
+// but are changed infrequently
#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
#include <afxctl.h> // MFC support for ActiveX Controls
#include <afxext.h> // MFC extensions
-#include <afxdtctl.h> // MFC support for Internet Explorer 4 Comon
Controls
+#include <afxdtctl.h> // MFC support for Internet Explorer 4 Common
Controls
#ifndef _AFX_NO_AFXCMN_SUPPORT
#include <afxcmn.h> // MFC support for Windows Common Controls
#endif // _AFX_NO_AFXCMN_SUPPORT
// Delete the two includes below if you do not wish to use the MFC
-// database classes
+// database classes
#include <afxdb.h> // MFC database classes
#include <afxdao.h> // MFC DAO database classes
commit f6c555b340fa654a1418e9408e608cfbffcef612
Author: Mechtilde Stehmann <mechti...@apache.org>
AuthorDate: Wed Nov 7 11:38:00 2018 +0000
Commit: Mechtilde Stehmann <mechti...@apache.org>
CommitDate: Wed Nov 7 11:38:00 2018 +0000
remove whitespaces
commit 8103c43630b8aead7746e4e0f0eeff38a3c5296b
Author: Matthias Seidel <msei...@apache.org>
AuthorDate: Tue Nov 6 17:40:06 2018 +0000
Commit: Matthias Seidel <msei...@apache.org>
CommitDate: Tue Nov 6 17:40:06 2018 +0000
Fixed typo (curently -> currently)
diff --git a/chart2/source/model/main/ChartModel.hxx
b/chart2/source/model/main/ChartModel.hxx
index 315592c25003..9cd171af6d26 100755
--- a/chart2/source/model/main/ChartModel.hxx
+++ b/chart2/source/model/main/ChartModel.hxx
@@ -605,7 +605,7 @@ public:
throw (::com::sun::star::lang::NoSupportException,
::com::sun::star::uno::RuntimeException);
- // ____ XDataSource ____ allows access to the curently used data and data
ranges
+ // ____ XDataSource ____ allows access to the currently used data and data
ranges
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference<
::com::sun::star::chart2::data::XLabeledDataSequence > > SAL_CALL
getDataSequences()
throw (::com::sun::star::uno::RuntimeException);
};
diff --git a/editeng/source/misc/hangulhanja.cxx
b/editeng/source/misc/hangulhanja.cxx
index 5194e2ae24eb..8fea5a8eda79 100644
--- a/editeng/source/misc/hangulhanja.cxx
+++ b/editeng/source/misc/hangulhanja.cxx
@@ -512,7 +512,7 @@ namespace editeng
m_eCurrentConversionDirection = eDialogDirection;
}
- // save curently used value for possible later use
+ // save currently used value for possible later use
m_pAntiImpl->m_bTryBothDirectionsSave = m_bTryBothDirections;
m_pAntiImpl->m_ePrimaryConversionDirectionSave =
m_eCurrentConversionDirection;
}
diff --git a/forms/source/component/Edit.cxx b/forms/source/component/Edit.cxx
index e8dc980a832b..bda5150ce2ef 100644
--- a/forms/source/component/Edit.cxx
+++ b/forms/source/component/Edit.cxx
@@ -660,7 +660,7 @@ void OEditModel::onDisconnectedDbColumn()
//------------------------------------------------------------------------------
sal_Bool OEditModel::approveDbColumnType( sal_Int32 _nColumnType )
{
- // if we act as rich text curently, we do not allow binding to a database
column
+ // if we act as rich text currently, we do not allow binding to a database
column
if ( implActsAsRichText() )
return sal_False;
diff --git a/svtools/source/brwbox/datwin.hxx b/svtools/source/brwbox/datwin.hxx
index 7418e3077711..425a312d7076 100644
--- a/svtools/source/brwbox/datwin.hxx
+++ b/svtools/source/brwbox/datwin.hxx
@@ -143,7 +143,7 @@ public:
FASTBOOL bInUpdateScrollbars; // Rekursionsschutz
FASTBOOL bHadRecursion; // Rekursion war aufgetreten
FASTBOOL bOwnDataChangedHdl; // dont change colors in
DataChanged
- FASTBOOL bCallingDropCallback; // we're in a callback to
AcceptDrop or ExecuteDrop curently
+ FASTBOOL bCallingDropCallback; // we're in a callback to
AcceptDrop or ExecuteDrop currently
sal_uInt16 nUpdateLock; // lock count, dont call
Control::Update()!
short nCursorHidden; // new conuter for DoHide/ShowCursor
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index c3069b5cc76a..f6a56a388ce5 100644
--- a/vcl/source/window/brdwin.cxx
+++ b/vcl/source/window/brdwin.cxx
@@ -1324,7 +1324,7 @@ void ImplSmallBorderWindowView::DrawWindow( sal_uInt16
nDrawFlags, OutputDevice*
nState |= CTRL_STATE_FOCUSED;
else if( mbNWFBorder )
{
- // FIXME: this is curently only on aqua, see if other platforms
can profit
+ // FIXME: this is currently only on aqua, see if other platforms
can profit
// FIXME: for aqua focus rings all controls need to support
GetNativeControlRegion
// for the dropdown style
commit 4981c619463160ea361fe96262b97d2b56fdbd30
Author: Mechtilde Stehmann <mechti...@apache.org>
AuthorDate: Tue Nov 6 15:40:28 2018 +0000
Commit: Mechtilde Stehmann <mechti...@apache.org>
CommitDate: Tue Nov 6 15:40:28 2018 +0000
remove whitespaces main/vcl/source/window/dockingarea.cxx
commit d64c8a3d3265993ae5689a619f19561c33e02bda
Author: Mechtilde Stehmann <mechti...@apache.org>
AuthorDate: Tue Nov 6 13:25:04 2018 +0000
Commit: Mechtilde Stehmann <mechti...@apache.org>
CommitDate: Tue Nov 6 13:25:04 2018 +0000
correct typo in main/vcl/source/window
diff --git a/vcl/source/window/dockingarea.cxx
b/vcl/source/window/dockingarea.cxx
index 50c524483e9d..a785606bdb30 100644
--- a/vcl/source/window/dockingarea.cxx
+++ b/vcl/source/window/dockingarea.cxx
@@ -98,7 +98,7 @@ void DockingAreaWindow::DataChanged( const DataChangedEvent&
rDCEvt )
static void ImplInvalidateMenubar( DockingAreaWindow* pThis )
{
- // due to a possible comon gradient covering menubar and top dockingarea
+ // due to a possible common gradient covering menubar and top dockingarea
// the menubar must be repainted if the top dockingarea changes size or
visibility
if( ImplGetSVData()->maNWFData.mbMenuBarDockingAreaCommonBG &&
(pThis->GetAlign() == WINDOWALIGN_TOP)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
