buildbot failure in on openoffice-win7
The Buildbot has detected a new failure on builder openoffice-win7 while building . Full details are available at: https://ci.apache.org/builders/openoffice-win7/builds/728 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb-win10 Build Reason: The Nightly scheduler named 'openoffice-win7-nightly' triggered this build Build Source Stamp: [branch trunk] HEAD Blamelist: BUILD FAILED: failed build.pl --all Sincerely, -The Buildbot
[openoffice-org] branch main updated (3756931 -> 8b996d4)
This is an automated email from the ASF dual-hosted git repository.
marcus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/openoffice-org.git.
from 3756931 Update for AOO 4.1.11 for OS/2
new bf031af New translations
new 253f315 New translations
new 8b996d4 New translations
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../{msg_prop_l10n_fr.js => msg_prop_l10n_fr2.js} | 763 ++---
content/fr/download/{index.html => index2.html}| 326 +++---
content/fr/index2.html | 1164 ++--
3 files changed, 1127 insertions(+), 1126 deletions(-)
copy assets/fr/download/{msg_prop_l10n_fr.js => msg_prop_l10n_fr2.js} (57%)
copy content/fr/download/{index.html => index2.html} (73%)
[openoffice-org] 01/03: New translations
This is an automated email from the ASF dual-hosted git repository. marcus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/openoffice-org.git commit bf031af8497224d5d4a62b3bbbe009bf26c0f99f Author: Marcus AuthorDate: Sat Nov 6 11:42:35 2021 +0100 New translations --- assets/fr/download/msg_prop_l10n_fr2.js | 382 1 file changed, 382 insertions(+) diff --git a/assets/fr/download/msg_prop_l10n_fr2.js b/assets/fr/download/msg_prop_l10n_fr2.js new file mode 100644 index 000..519af5d --- /dev/null +++ b/assets/fr/download/msg_prop_l10n_fr2.js @@ -0,0 +1,382 @@ +/* This file is to maintain text information that can be used on the download webpage via JavaScript when + * including this file. + * + * Instead of hard coded text in the green box please use these variables and translate it to your favorite language. + * + * Wrong: "Download Apache OpenOffice" + * Correct:l10n.dl_green_box_headline_text + */ + + + +// Object that contains all following variables. +var l10n = new Object(); + +// The following variables are used in the "index.html" file: + +// Set a specific language ISO code to force to assemble a download link with a certain language. +DL.NL_LANG = "fr"; + +// General: +l10n.dl_headline_text = "Apache OpenOffice Download"; + +// Download: Strings in the green box (used in "index.html"). +l10n.dl_green_box_headline_text= "Télécharger Apache OpenOffice"; +l10n.dl_green_box_headline_title = "Téléchargez Apache OpenOffice pour votre système d'exploitation, votre langue et votre version préférés"; +l10n.dl_green_box_subtext1_text= "Hébergé par SourceForge.net - Un site de confiance"; +l10n.dl_green_box_subtext1_title = "Les fichiers binaires Apache OpenOffice sont hébergés par SourceForge.net - Un site Web de confiance"; +l10n.dl_green_box_subtext2_text= "Sélectionnez votre système d'exploitation, votre langue et votre version préférés"; +l10n.dl_green_box_subtext2_title = "Sélectionnez votre système d\'exploitation, votre langue et votre version préférés"; +l10n.dl_green_box_selectbox_os_title = "Sélectionnez votre système d exploitation préféré"; +l10n.dl_green_box_selectbox_lang_title = "Sélectionnez votre langue préférée"; +l10n.dl_green_box_selectbox_ver_title = "Sélectionnez votre version préférée"; + +// The strings that will be shown in the OS, language and version drop-down select boxes. +// You must leave at least one single empty string (see the comment lines below the 3 following variables)! +/* l10n.dl_green_box_select_box_os_values = [ "" ]; */ +l10n.dl_green_box_select_box_os_values = [ "" ]; + +/* l10n.dl_green_box_select_box_language_values= [ "" ]; */ +l10n.dl_green_box_select_box_language_values = [ "" ]; + +/* l10n.dl_green_box_select_box_lang_values_custom = [ "" ]; */ +// Value Visible text Tool tip +l10n.dl_green_box_select_box_lang_values_custom = [ "ast", "Asturian", "Asturianu", + "eu", "Basque", "Euskara", + "bg", "Bulgarian", "българÑки език", + "ca", "Catalan", "Català ", + "ca-XV","Catalan [Valencia AVL]", "València (AVL)", + "ca-XR","Catalan [Valencia RACV]", "València (RACV)", + "zh-CN","Chinese [simplified]", "简体ä¸æ–‡", + "zh-TW","Chinese [traditional]","æ£é«”ä¸æ–‡", + "cs", "Czech", "ÄŒeÅ¡tina", + "da", "Danish", "Dansk", + "nl", "Dutch", "Nederlands", + "en-GB","English [British]","English [British]", + "en-US","English [US]", "English [US]", + "fi", "Finnish", "Suomi", + "fr", "French", "Français", +
[openoffice-org] 03/03: New translations
This is an automated email from the ASF dual-hosted git repository.
marcus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/openoffice-org.git
commit 8b996d46a593ddb07fb7819cd31ab3e51259942b
Author: Marcus
AuthorDate: Sat Nov 6 11:43:20 2021 +0100
New translations
---
content/fr/index2.html | 1164
1 file changed, 582 insertions(+), 582 deletions(-)
diff --git a/content/fr/index2.html b/content/fr/index2.html
index 9670d06..671ebc2 100644
--- a/content/fr/index2.html
+++ b/content/fr/index2.html
@@ -1,582 +1,582 @@
-http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
-http://www.w3.org/1999/xhtml"; xml:lang="fr" lang="fr">
-
-
-
-
-
-
-
-Apache OpenOffice - Official Site - The Free and Open Productivity
Suite
-
-
-
-/* */
-
-
- function follow( platform ) {
-// _gaq.push( ['_trackEvent', 'social', 'followUs', platform] );
-
-if ( platform == 'ApacheBlog' ) {
- window.open( "https://blogs.apache.org/OOo/";, "_blank" );
-} else if ( platform == 'Facebook' ) {
- window.open( "https://www.facebook.com/ApacheOO";, "_blank" );
-} else if ( platform == 'Twitter' ) {
- window.open( "https://twitter.com/ApacheOO";, "_blank" );
-} else if ( platform == 'YouTube' ) {
- window.open( "https://www.youtube.com/openoffice";, "_blank" );
-}
- }
-
- function showAlertBox() {
- // The text is defined in "msg_prop_l10n_fr.js".
-
- // Show the alert box or not?
- if( l10n.index_alert_box_show ) {
- // Depending if link is available, make the whole DIV clickable
or not.
- if( l10n.index_alert_box_href ) {
- // Show the text with link and cursor as pointer.
- document.write( "- " );
-
- // Show headline.
- document.write( "
"
- + l10n.index_alert_box_headline_text + "
" );
-
- // Show text.
- if( l10n.index_alert_box_text_text ) {
- document.write( ""
- + l10n.index_alert_box_text_text + "
" );
- }
- } else {
- // Show the text without link and normal cursor.
- document.write( "- " );
-
- // Show headline.
- document.write( "
"
- + l10n.index_alert_box_headline_text + "
" );
-
- // Show text.
- if( l10n.index_alert_box_text_text ) {
- document.write( ""
- + l10n.index_alert_box_text_text + "
" );
- }
- }
- document.write( "
" ); // Alert box.
- }
- }
-
-
-
-
-
-
-Apache OpenOffice
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-I want to learn more about OpenOffice
-What is Apache OpenOffice? And why should I use it?
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ https://sourceforge.net/projects/openofficeorg.mirror/files/";
+ title="Select from all platforms, languages, language packs to
download">
+ Téléchargements Apache OpenOffice - Site officiel
+
+
+
+ https://sourceforge.net/projects/openofficeorg.mirror/files/";
+ title="Select from all platforms, languages and language packs to
download">
+ Le navigateur semble avoir désactivé JavaScript. Cette technique
est utilisée pour montrer le réel
+ lien de téléchargement. Si vous voulez quand même
télécharger Apache OpenOffice, cliquez sur ce texte pour choisir
+ à partir de la page Web de téléchargement alternatif.
Vous devrez naviguer vers
+ le sous-dossierversion/binaires/langue et
télécharger le fichier nommé
+
Apache_OpenOffice_version_os_platform_package_language.ext.
+ Nous nous excusons pour le désagrément.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ https://sourceforge.net/projects/openofficeorg.mirror/files/";
+ title="Select from all platforms, languages, language packs to
download">
+ Téléchargements Apache OpenOffice - Site officiel
+
+
+
+ https://sourceforge.net/projects/openofficeorg.mirror/files/";
+ title="Select from all platforms, languages and language packs to
download">
+ Le navigateur semble avoir désactivé JavaScript. Cette technique
est utilisée pour montrer le réel
+ lien de téléchargement. Si vous voulez quand même
télécharger Apache OpenOffice, cliquez sur ce texte pour choisir
+ à partir de la pag
OpenOffice-org Staging Site Published
OpenOffice » OpenOffice-org-Staging-Site-Build - Build # 524 - Successful:
Check console output at
https://ci-builds.apache.org/job/OpenOffice/job/OpenOffice-org-Staging-Site-Build/524/
to view the results.
buildbot failure in on openoffice-win7-41x
The Buildbot has detected a new failure on builder openoffice-win7-41x while
building . Full details are available at:
https://ci.apache.org/builders/openoffice-win7-41x/builds/179
Buildbot URL: https://ci.apache.org/
Buildslave for this Build: bb-win10
Build Reason: The Nightly scheduler named 'openoffice-win7-41x' triggered this
build
Build Source Stamp: [branch AOO42X] HEAD
Blamelist:
BUILD FAILED: failed build.pl --all move the split install bits back
Sincerely,
-The Buildbot
[openoffice] branch trunk updated: Fix for Bugzilla #128489 (#140)
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new 3ee92af Fix for Bugzilla #128489 (#140)
3ee92af is described below
commit 3ee92af9639dd80a1e93eb1f3aac6a970a5c9228
Author: Matthias Seidel
AuthorDate: Sat Nov 6 16:08:06 2021 +0100
Fix for Bugzilla #128489 (#140)
rendering for extrusion depth of custom shapes is wrong for position values
other than zero
See: https://bz.apache.org/ooo/show_bug.cgi?id=128489
Many thanks to Regina Henschel!
---
main/svx/source/customshapes/EnhancedCustomShape3d.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/main/svx/source/customshapes/EnhancedCustomShape3d.cxx
b/main/svx/source/customshapes/EnhancedCustomShape3d.cxx
index 18ee453..1510ca0 100644
--- a/main/svx/source/customshapes/EnhancedCustomShape3d.cxx
+++ b/main/svx/source/customshapes/EnhancedCustomShape3d.cxx
@@ -337,7 +337,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const
SdrObject* pShape2d, con
double fExtrusionBackward, fExtrusionForward;
GetExtrusionDepth( rGeometryItem, pMap, fExtrusionBackward,
fExtrusionForward );
- double fDepth = fExtrusionBackward - fExtrusionForward;
+ double fDepth = fExtrusionBackward + fExtrusionForward;
if ( fDepth < 1.0 )
fDepth = 1.0;
@@ -795,7 +795,7 @@ Rectangle EnhancedCustomShape3d::CalculateNewSnapRect(
const SdrObject* pCustomS
for ( i = 0L; i < 4L; i++ )
{
- aBoundVolume.append(basegfx::B3DPoint(aPolygon[ (sal_uInt16)i
].X() - aCenter.X(), aPolygon[ (sal_uInt16)i ].Y() - aCenter.Y(),
fExtrusionForward));
+ aBoundVolume.append(basegfx::B3DPoint(aPolygon[ (sal_uInt16)i
].X() - aCenter.X(), aPolygon[ (sal_uInt16)i ].Y() - aCenter.Y(),
-fExtrusionForward));
}
for ( i = 0L; i < 4L; i++ )
[openoffice] branch AOO42X updated: Fix for Bugzilla #128489 (#140)
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new 1c05ace Fix for Bugzilla #128489 (#140)
1c05ace is described below
commit 1c05acecb7f8aba5700445f06fa3359dc21f80ea
Author: Matthias Seidel
AuthorDate: Sat Nov 6 16:08:06 2021 +0100
Fix for Bugzilla #128489 (#140)
rendering for extrusion depth of custom shapes is wrong for position values
other than zero
See: https://bz.apache.org/ooo/show_bug.cgi?id=128489
Many thanks to Regina Henschel!
(cherry picked from commit 3ee92af9639dd80a1e93eb1f3aac6a970a5c9228)
---
main/svx/source/customshapes/EnhancedCustomShape3d.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/main/svx/source/customshapes/EnhancedCustomShape3d.cxx
b/main/svx/source/customshapes/EnhancedCustomShape3d.cxx
index 18ee453..1510ca0 100644
--- a/main/svx/source/customshapes/EnhancedCustomShape3d.cxx
+++ b/main/svx/source/customshapes/EnhancedCustomShape3d.cxx
@@ -337,7 +337,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const
SdrObject* pShape2d, con
double fExtrusionBackward, fExtrusionForward;
GetExtrusionDepth( rGeometryItem, pMap, fExtrusionBackward,
fExtrusionForward );
- double fDepth = fExtrusionBackward - fExtrusionForward;
+ double fDepth = fExtrusionBackward + fExtrusionForward;
if ( fDepth < 1.0 )
fDepth = 1.0;
@@ -795,7 +795,7 @@ Rectangle EnhancedCustomShape3d::CalculateNewSnapRect(
const SdrObject* pCustomS
for ( i = 0L; i < 4L; i++ )
{
- aBoundVolume.append(basegfx::B3DPoint(aPolygon[ (sal_uInt16)i
].X() - aCenter.X(), aPolygon[ (sal_uInt16)i ].Y() - aCenter.Y(),
fExtrusionForward));
+ aBoundVolume.append(basegfx::B3DPoint(aPolygon[ (sal_uInt16)i
].X() - aCenter.X(), aPolygon[ (sal_uInt16)i ].Y() - aCenter.Y(),
-fExtrusionForward));
}
for ( i = 0L; i < 4L; i++ )
[openoffice] branch AOO41X updated: Fix for Bugzilla #128489 (#140)
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO41X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO41X by this push:
new 298d367 Fix for Bugzilla #128489 (#140)
298d367 is described below
commit 298d36787efdaf44ef5c95b58e441beba9fb89a2
Author: Matthias Seidel
AuthorDate: Sat Nov 6 16:08:06 2021 +0100
Fix for Bugzilla #128489 (#140)
rendering for extrusion depth of custom shapes is wrong for position values
other than zero
See: https://bz.apache.org/ooo/show_bug.cgi?id=128489
Many thanks to Regina Henschel!
(cherry picked from commit 3ee92af9639dd80a1e93eb1f3aac6a970a5c9228)
---
main/svx/source/customshapes/EnhancedCustomShape3d.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/main/svx/source/customshapes/EnhancedCustomShape3d.cxx
b/main/svx/source/customshapes/EnhancedCustomShape3d.cxx
index 18ee453..1510ca0 100644
--- a/main/svx/source/customshapes/EnhancedCustomShape3d.cxx
+++ b/main/svx/source/customshapes/EnhancedCustomShape3d.cxx
@@ -337,7 +337,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const
SdrObject* pShape2d, con
double fExtrusionBackward, fExtrusionForward;
GetExtrusionDepth( rGeometryItem, pMap, fExtrusionBackward,
fExtrusionForward );
- double fDepth = fExtrusionBackward - fExtrusionForward;
+ double fDepth = fExtrusionBackward + fExtrusionForward;
if ( fDepth < 1.0 )
fDepth = 1.0;
@@ -795,7 +795,7 @@ Rectangle EnhancedCustomShape3d::CalculateNewSnapRect(
const SdrObject* pCustomS
for ( i = 0L; i < 4L; i++ )
{
- aBoundVolume.append(basegfx::B3DPoint(aPolygon[ (sal_uInt16)i
].X() - aCenter.X(), aPolygon[ (sal_uInt16)i ].Y() - aCenter.Y(),
fExtrusionForward));
+ aBoundVolume.append(basegfx::B3DPoint(aPolygon[ (sal_uInt16)i
].X() - aCenter.X(), aPolygon[ (sal_uInt16)i ].Y() - aCenter.Y(),
-fExtrusionForward));
}
for ( i = 0L; i < 4L; i++ )
[openoffice] branch trunk updated: Fixed typos, removed whitespace
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new 16e7aaa Fixed typos, removed whitespace
16e7aaa is described below
commit 16e7aaaec5597da94bf8beaa15cf3b9f77a80cc7
Author: mseidel
AuthorDate: Sat Nov 6 20:12:43 2021 +0100
Fixed typos, removed whitespace
---
main/sd/source/ui/app/_app.hrc | 8
main/sd/source/ui/app/sddll.cxx| 39 +++
main/sd/source/ui/app/sddll1.cxx | 42 +-
main/sd/source/ui/app/sdresid.cxx | 12 ---
main/sd/source/ui/app/strings.src | 37 ++---
main/sd/source/ui/app/tmplctrl.cxx | 29 --
6 files changed, 77 insertions(+), 90 deletions(-)
diff --git a/main/sd/source/ui/app/_app.hrc b/main/sd/source/ui/app/_app.hrc
index 3ba60e9..81f2a6d 100644
--- a/main/sd/source/ui/app/_app.hrc
+++ b/main/sd/source/ui/app/_app.hrc
@@ -1,5 +1,5 @@
/**
- *
+ *
* 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
@@ -7,16 +7,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.
- *
+ *
*/
diff --git a/main/sd/source/ui/app/sddll.cxx b/main/sd/source/ui/app/sddll.cxx
index 6a8a27e..3610a3d 100644
--- a/main/sd/source/ui/app/sddll.cxx
+++ b/main/sd/source/ui/app/sddll.cxx
@@ -1,5 +1,5 @@
/**
- *
+ *
* 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
@@ -7,16 +7,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.
- *
+ *
*/
@@ -55,9 +55,7 @@ using namespace ::com::sun::star;
/*
-|*
|* Init
-|*
\/
void SdDLL::Init()
@@ -91,15 +89,15 @@ void SdDLL::Init()
if (SvtModuleOptions().IsImpress())
{
-// Register the Impress shape types in order to make the shapes
accessible.
-::accessibility::RegisterImpressShapeTypes ();
-::sd::DrawDocShell::Factory().SetDocumentServiceName( String(
RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.PresentationDocument" )
) );
+ // Register the Impress shape types in order to make the shapes
accessible.
+ ::accessibility::RegisterImpressShapeTypes ();
+ ::sd::DrawDocShell::Factory().SetDocumentServiceName( String(
RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.PresentationDocument" )
) );
}
-if (SvtModuleOptions().IsDraw())
+ if (SvtModuleOptions().IsDraw())
{
-::sd::GraphicDocShell::Factory().SetDocumentServiceName( String(
RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.DrawingDocument" ) ) );
-}
+ ::sd::GraphicDocShell::Factory().SetDocumentServiceName(
String( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.DrawingDocument" ) )
);
+ }
// register your view-factories here
RegisterFactorys();
@@ -110,14 +108,14 @@ void SdDLL::Init()
// register your controllers here
RegisterControllers();
-// SvDraw-Felder registrieren
-SdrRegisterFieldClasses();
+ // SvDraw-Felder registrieren
+ SdrRegisterFieldClasses();
-// 3D-Objekt-Factory eintragen
-E3dObjFactory();
+ // 3D-Objekt-Facto
[openoffice] branch AOO42X updated: Fixed typos, removed whitespace
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new 0569cb2 Fixed typos, removed whitespace
0569cb2 is described below
commit 0569cb28dbd784578009356acc2696e61bb200ba
Author: mseidel
AuthorDate: Sat Nov 6 20:12:43 2021 +0100
Fixed typos, removed whitespace
(cherry picked from commit 16e7aaaec5597da94bf8beaa15cf3b9f77a80cc7)
---
main/sd/source/ui/app/_app.hrc | 8
main/sd/source/ui/app/sddll.cxx| 39 +++
main/sd/source/ui/app/sddll1.cxx | 42 +-
main/sd/source/ui/app/sdresid.cxx | 12 ---
main/sd/source/ui/app/strings.src | 37 ++---
main/sd/source/ui/app/tmplctrl.cxx | 29 --
6 files changed, 77 insertions(+), 90 deletions(-)
diff --git a/main/sd/source/ui/app/_app.hrc b/main/sd/source/ui/app/_app.hrc
index 3ba60e9..81f2a6d 100644
--- a/main/sd/source/ui/app/_app.hrc
+++ b/main/sd/source/ui/app/_app.hrc
@@ -1,5 +1,5 @@
/**
- *
+ *
* 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
@@ -7,16 +7,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.
- *
+ *
*/
diff --git a/main/sd/source/ui/app/sddll.cxx b/main/sd/source/ui/app/sddll.cxx
index 6a8a27e..3610a3d 100644
--- a/main/sd/source/ui/app/sddll.cxx
+++ b/main/sd/source/ui/app/sddll.cxx
@@ -1,5 +1,5 @@
/**
- *
+ *
* 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
@@ -7,16 +7,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.
- *
+ *
*/
@@ -55,9 +55,7 @@ using namespace ::com::sun::star;
/*
-|*
|* Init
-|*
\/
void SdDLL::Init()
@@ -91,15 +89,15 @@ void SdDLL::Init()
if (SvtModuleOptions().IsImpress())
{
-// Register the Impress shape types in order to make the shapes
accessible.
-::accessibility::RegisterImpressShapeTypes ();
-::sd::DrawDocShell::Factory().SetDocumentServiceName( String(
RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.PresentationDocument" )
) );
+ // Register the Impress shape types in order to make the shapes
accessible.
+ ::accessibility::RegisterImpressShapeTypes ();
+ ::sd::DrawDocShell::Factory().SetDocumentServiceName( String(
RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.PresentationDocument" )
) );
}
-if (SvtModuleOptions().IsDraw())
+ if (SvtModuleOptions().IsDraw())
{
-::sd::GraphicDocShell::Factory().SetDocumentServiceName( String(
RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.DrawingDocument" ) ) );
-}
+ ::sd::GraphicDocShell::Factory().SetDocumentServiceName(
String( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.DrawingDocument" ) )
);
+ }
// register your view-factories here
RegisterFactorys();
@@ -110,14 +108,14 @@ void SdDLL::Init()
// register your controllers here
RegisterControllers();
-// SvDraw-Felder registrieren
-SdrRegisterFieldClasses();
+ // SvDraw-Felder registrieren
+ SdrRegisterFieldClasses();
-
