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 <msei...@apache.org>
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-Factory eintragen
+ E3dObjFactory();
- // ::com::sun::star::form::component::Form-Objekt-Factory eintragen
- FmFormObjFactory();
+ // ::com::sun::star::form::component::Form-Objekt-Factory eintragen
+ FmFormObjFactory();
// Objekt-Factory eintragen
SdrObjFactory::InsertMakeUserDataHdl(LINK(&aSdObjectFactory,
SdObjectFactory, MakeUserData));
@@ -126,14 +124,12 @@ void SdDLL::Init()
/*************************************************************************
-|*
|* Exit
-|*
\************************************************************************/
void SdDLL::Exit()
{
- // called directly befor unloading the DLL
+ // called directly before unloading the DLL
// do whatever you want, Sd-DLL is accessible
// Objekt-Factory austragen
@@ -144,4 +140,3 @@ void SdDLL::Exit()
delete (*ppShlPtr);
(*ppShlPtr) = NULL;
}
-
diff --git a/main/sd/source/ui/app/sddll1.cxx b/main/sd/source/ui/app/sddll1.cxx
index 60e3466..9d2338f 100644
--- a/main/sd/source/ui/app/sddll1.cxx
+++ b/main/sd/source/ui/app/sddll1.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,37 +55,33 @@ namespace sd { namespace ui { namespace table {
/*************************************************************************
-|*
|* Register all Factorys
-|*
\************************************************************************/
void SdDLL::RegisterFactorys()
{
if (SvtModuleOptions().IsImpress())
- {
- ::sd::ImpressViewShellBase::RegisterFactory (
- ::sd::IMPRESS_FACTORY_ID);
- ::sd::SlideSorterViewShellBase::RegisterFactory (
- ::sd::SLIDE_SORTER_FACTORY_ID);
- ::sd::OutlineViewShellBase::RegisterFactory (
- ::sd::OUTLINE_FACTORY_ID);
- ::sd::PresentationViewShellBase::RegisterFactory (
- ::sd::PRESENTATION_FACTORY_ID);
- }
+ {
+ ::sd::ImpressViewShellBase::RegisterFactory (
+ ::sd::IMPRESS_FACTORY_ID);
+ ::sd::SlideSorterViewShellBase::RegisterFactory (
+ ::sd::SLIDE_SORTER_FACTORY_ID);
+ ::sd::OutlineViewShellBase::RegisterFactory (
+ ::sd::OUTLINE_FACTORY_ID);
+ ::sd::PresentationViewShellBase::RegisterFactory (
+ ::sd::PRESENTATION_FACTORY_ID);
+ }
if (SvtModuleOptions().IsDraw())
- {
+ {
::sd::GraphicViewShellBase::RegisterFactory
(::sd::DRAW_FACTORY_ID);
- }
+ }
}
/*************************************************************************
-|*
|* Register all Interfaces
-|*
\************************************************************************/
void SdDLL::RegisterInterfaces()
@@ -94,7 +90,7 @@ void SdDLL::RegisterInterfaces()
SfxModule* pMod = SD_MOD();
SdModule::RegisterInterface(pMod);
- // View shell base.
+ // View shell base.
::sd::ViewShellBase::RegisterInterface(pMod);
// DocShells
@@ -120,6 +116,6 @@ void SdDLL::RegisterInterfaces()
// Table ObjectShell
::sd::ui::table::RegisterInterfaces(pMod);
- // View shells for the side panes.
- ::sd::slidesorter::SlideSorterViewShell::RegisterInterface (pMod);
+ // View shells for the side panes.
+ ::sd::slidesorter::SlideSorterViewShell::RegisterInterface (pMod);
}
diff --git a/main/sd/source/ui/app/sdresid.cxx
b/main/sd/source/ui/app/sdresid.cxx
index d68c904..5ff6fa2 100644
--- a/main/sd/source/ui/app/sdresid.cxx
+++ b/main/sd/source/ui/app/sdresid.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.
- *
+ *
*************************************************************/
@@ -29,14 +29,10 @@
/*************************************************************************
-|*
|* Ctor
-|*
\************************************************************************/
SdResId::SdResId(sal_uInt16 nId) :
ResId(nId, *SD_MOD()->GetResMgr())
{
}
-
-
diff --git a/main/sd/source/ui/app/strings.src
b/main/sd/source/ui/app/strings.src
index 2083f78..f23341b 100644
--- a/main/sd/source/ui/app/strings.src
+++ b/main/sd/source/ui/app/strings.src
@@ -20,6 +20,7 @@
*************************************************************/
+
#include "strings.hrc"
#include "sdstring.hrc"
#include "glob.hrc"
@@ -435,41 +436,41 @@ String STR_EDIT_OBJ
};
ModalDialog RID_UNDO_DELETE_WARNING
{
- OutputSize = TRUE;
- Size = MAP_APPFONT( 175 + 39 + (3 * 6), (7 * 12) + 6 );
- Moveable = TRUE;
- Closeable = TRUE;
+ OutputSize = TRUE ;
+ Size = MAP_APPFONT ( 175 + 39 + (3 * 6), (7 * 12) + 6 ) ;
+ Moveable = TRUE ;
+ Closeable = TRUE ;
- HelpID = HID_UNDO_DELETE_WARNING;
+ HelpID = HID_UNDO_DELETE_WARNING ;
FixedImage IMG_UNDO_DELETE_WARNING
{
- Pos = MAP_APPFONT( 6, 6 );
- Size = MAP_APPFONT( 30, 30 );
+ Pos = MAP_APPFONT ( 6, 6 ) ;
+ Size = MAP_APPFONT ( 30, 30 ) ;
};
FixedText FT_UNDO_DELETE_WARNING
{
- Pos = MAP_APPFONT( 39, 6 );
- Size = MAP_APPFONT( 175, 4 * 12 );
- WordBreak = TRUE;
+ Pos = MAP_APPFONT ( 39, 6 ) ;
+ Size = MAP_APPFONT ( 175, 4 * 12 ) ;
+ WordBreak = TRUE ;
Text [ en-US ] = "This action deletes the list of actions that
can\nbe undone. Previous changes made to the document are still valid,\nbut
cannot be undone. Do you want to continue and\nthus assign the new slide
design?" ;
};
CheckBox CB_UNDO_DELETE_DISABLE
{
HelpID =
"sd:CheckBox:RID_UNDO_DELETE_WARNING:CB_UNDO_DELETE_DISABLE" ;
- Pos = MAP_APPFONT( 39, (4 * 12) + 9 );
- Size = MAP_APPFONT( 175, 12 );
+ Pos = MAP_APPFONT ( 39, (4 * 12) + 9 ) ;
+ Size = MAP_APPFONT ( 175, 12 ) ;
Text [ en-US ] = "~Do not show this warning again" ;
};
OKButton BTN_UNDO_DELETE_YES
{
- Pos = MAP_APPFONT( 60, (5 * 12) + 13 );
- Size = MAP_APPFONT( 50, 14 );
+ Pos = MAP_APPFONT ( 60, (5 * 12) + 13 ) ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
};
CancelButton BTN_UNDO_DELETE_NO
{
- Pos = MAP_APPFONT( 120, (5 * 12) + 13 );
- Size = MAP_APPFONT( 50, 14 );
+ Pos = MAP_APPFONT ( 120, (5 * 12) + 13 ) ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
DefButton = TRUE;
};
Text [ en-US ] = "%PRODUCTNAME %PRODUCTVERSION" ;
@@ -1245,7 +1246,7 @@ String RID_ANNOTATIONS_START
String STR_RESET_LAYOUT
{
- Text[ en-US ] = "Reset Slide Layout" ;
+ Text [ en-US ] = "Reset Slide Layout" ;
};
String STR_INSERT_TABLE
@@ -1312,3 +1313,5 @@ String STR_SAR_WRAP_BACKWARD_DRAW
{
Text [ en-US ] = "%PRODUCTNAME Draw has searched to the beginning of
the document. Do you want to continue at the end?" ;
};
+
+// ********************************************************************** EOF
diff --git a/main/sd/source/ui/app/tmplctrl.cxx
b/main/sd/source/ui/app/tmplctrl.cxx
index b81b71c..8b7784c 100644
--- a/main/sd/source/ui/app/tmplctrl.cxx
+++ b/main/sd/source/ui/app/tmplctrl.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.
- *
+ *
*************************************************************/
@@ -53,7 +53,7 @@ public:
private:
sal_uInt16 nCurId;
- virtual void Select();
+ virtual void Select();
};
// -----------------------------------------------------------------------
@@ -74,9 +74,9 @@ void TemplatePopup_Impl::Select()
// class SdTemplateControl ------------------------------------------
SdTemplateControl::SdTemplateControl( sal_uInt16 _nSlotId,
- sal_uInt16 _nId,
- StatusBar& rStb ) :
- SfxStatusBarControl( _nSlotId, _nId, rStb )
+
sal_uInt16 _nId,
+
StatusBar& rStb ) :
+ SfxStatusBarControl( _nSlotId, _nId, rStb )
{
}
@@ -89,7 +89,7 @@ SdTemplateControl::~SdTemplateControl()
// -----------------------------------------------------------------------
void SdTemplateControl::StateChanged(
- sal_uInt16 /*nSID*/, SfxItemState eState, const SfxPoolItem* pState )
+ sal_uInt16 /*nSID*/, SfxItemState eState, const SfxPoolItem* pState )
{
if( eState != SFX_ITEM_AVAILABLE || pState->ISA( SfxVoidItem ) )
GetStatusBar().SetItemText( GetId(), String() );
@@ -102,7 +102,7 @@ void SdTemplateControl::StateChanged(
// -----------------------------------------------------------------------
-void SdTemplateControl::Paint( const UserDrawEvent& )
+void SdTemplateControl::Paint( const UserDrawEvent& )
{
GetStatusBar().SetItemText( GetId(), msTemplate );
}
@@ -127,18 +127,18 @@ void SdTemplateControl::Command( const CommandEvent&
rCEvt )
TemplatePopup_Impl aPop;
{
const sal_uInt16 nMasterCount =
pDoc->GetMasterSdPageCount(PK_STANDARD);
-
+
sal_uInt16 nCount = 0;
for( sal_uInt16 nPage = 0; nPage < nMasterCount;
++nPage )
{
SdPage* pMaster = pDoc->GetMasterSdPage(nPage,
PK_STANDARD);
if( pMaster )
- aPop.InsertItem( ++nCount,
pMaster->GetName() );
+ aPop.InsertItem( ++nCount,
pMaster->GetName() );
}
aPop.Execute( &GetStatusBar(),
rCEvt.GetMousePosPixel());
sal_uInt16 nCurrId = aPop.GetCurId()-1;
- if( nCurrId < nMasterCount )
+ if( nCurrId < nMasterCount )
{
SdPage* pMaster =
pDoc->GetMasterSdPage(nCurrId, PK_STANDARD);
SfxStringItem aStyle( ATTR_PRESLAYOUT_NAME,
pMaster->GetName() );
@@ -151,6 +151,3 @@ void SdTemplateControl::Command( const CommandEvent& rCEvt )
ReleaseMouse();
}
}
-
-
-
