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 9b004a7b05 Fixed typos, cleanup
9b004a7b05 is described below
commit 9b004a7b05cb3557beee722aecdce5c60ff2a1e9
Author: mseidel <[email protected]>
AuthorDate: Fri Sep 19 15:39:21 2025 +0200
Fixed typos, cleanup
---
main/UnoControls/inc/definesunocontrols.hxx | 22 +--
main/UnoControls/source/controls/framecontrol.cxx | 2 -
main/UnoControls/source/inc/framecontrol.hxx | 6 +-
main/avmedia/source/macavf/macavf_common.hxx | 10 +-
main/connectivity/source/drivers/dbase/DTables.cxx | 20 +--
main/extensions/source/dbpilots/dbpilots.src | 58 ++++----
main/extensions/source/dbpilots/gridpages.src | 2 -
main/extensions/source/dbpilots/groupboxpages.src | 1 -
main/extensions/source/dbpilots/listcombopages.src | 151 +++++++++------------
main/oox/inc/oox/xls/formulabase.hxx | 12 +-
main/sd/source/filter/ppt/pptin.cxx | 56 ++++----
main/sw/inc/pagepreviewlayout.hxx | 6 +-
main/vcl/source/gdi/pngread.cxx | 7 +-
13 files changed, 165 insertions(+), 188 deletions(-)
diff --git a/main/UnoControls/inc/definesunocontrols.hxx
b/main/UnoControls/inc/definesunocontrols.hxx
index a2a8263fd0..de66ea5ff5 100644
--- a/main/UnoControls/inc/definesunocontrols.hxx
+++ b/main/UnoControls/inc/definesunocontrols.hxx
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
#ifndef _UNOCONTROLS_DEFINES_CTRL_HXX
#define _UNOCONTROLS_DEFINES_CTRL_HXX
@@ -33,7 +31,7 @@ namespace unocontrols{
//-------------------------------------------------------------------------------------------------------------------
// global defines for all UnoControls
//-------------------------------------------------------------------------------------------------------------------
-#define UNOCONTROLS_TRGB_COLORDATA( t,r,g,b )
((INT32)(((UINT32)((UINT8)(b))))|(((UINT32)((UINT8)(g)))<<8)|(((UINT32)((UINT8)(r)))<<16)|(((UINT32)((UINT8)(t)))<<24))
+#define UNOCONTROLS_TRGB_COLORDATA( t,r,g,b )
((INT32)(((UINT32)((UINT8)(b))))|(((UINT32)((UINT8)(g)))<<8)|(((UINT32)((UINT8)(r)))<<16)|(((UINT32)((UINT8)(t)))<<24))
//-------------------------------------------------------------------------------------------------------------------
// defines for BaseControl
@@ -54,7 +52,7 @@ namespace unocontrols{
//-------------------------------------------------------------------------------------------------------------------
// defines for BaseContainerControl
#ifdef _UNOCONTROLS_BASECONTAINERCONTROL_CTRL_HXX
- #define BASECONTAINERCONTROL_IDLCLASSNAME
"BaseContainerControl"
+ #define BASECONTAINERCONTROL_IDLCLASSNAME
"BaseContainerControl"
#endif
//-------------------------------------------------------------------------------------------------------------------
@@ -69,7 +67,7 @@ namespace unocontrols{
#define PROGRESSBAR_DEFAULT_BLOCKDIMENSION
Size(1,1)
#define PROGRESSBAR_DEFAULT_BACKGROUNDCOLOR
UNOCONTROLS_TRGB_COLORDATA( 0x00, 0xC0, 0xC0, 0xC0 ) // lightgray
#define PROGRESSBAR_DEFAULT_FOREGROUNDCOLOR
UNOCONTROLS_TRGB_COLORDATA( 0x00, 0x00, 0x00, 0x80 ) // blue
- #define PROGRESSBAR_DEFAULT_MINRANGE INT_MIN
+ #define PROGRESSBAR_DEFAULT_MINRANGE
INT_MIN
#define PROGRESSBAR_DEFAULT_MAXRANGE
INT_MAX
#define PROGRESSBAR_DEFAULT_BLOCKVALUE
1
#define PROGRESSBAR_DEFAULT_VALUE
PROGRESSBAR_DEFAULT_MINRANGE
@@ -90,11 +88,11 @@ namespace unocontrols{
#define FRAMECONTROL_PROPERTYNAME_FRAME
"Frame"
#define FRAMECONTROL_PROPERTYNAME_IDLCLASSES
"IDLClasses"
#define FRAMECONTROL_ERRORTEXT_VOSENSHURE
"This is an invalid property handle."
- #define FRAMECONTROL_PROPERTY_COUNT
4
// you must count the propertys
+ #define FRAMECONTROL_PROPERTY_COUNT
4
// you must count the properties
#define FRAMECONTROL_PROPERTY_COMPONENTURL
0
// Id must be the index into the array
#define FRAMECONTROL_PROPERTY_FRAME
1
#define FRAMECONTROL_PROPERTY_IDLCLASSES
2
- #define FRAMECONTROL_PROPERTY_LOADERARGUMENTS 3
+ #define FRAMECONTROL_PROPERTY_LOADERARGUMENTS 3
#endif
//-------------------------------------------------------------------------------------------------------------------
@@ -112,12 +110,12 @@ namespace unocontrols{
#define PROGRESSMONITOR_FIXEDTEXT_MODELNAME
"com.sun.star.awt.UnoControlFixedTextModel"
#define PROGRESSMONITOR_BUTTON_MODELNAME
"com.sun.star.awt.UnoControlButtonModel"
#define PROGRESSMONITOR_CONTROLNAME_TEXT
"Text"
// identifier the control in container
- #define PROGRESSMONITOR_CONTROLNAME_BUTTON
"Button"
// -||-
- #define PROGRESSMONITOR_CONTROLNAME_PROGRESSBAR
"ProgressBar"
// -||-
+ #define PROGRESSMONITOR_CONTROLNAME_BUTTON
"Button"
// -||-
+ #define PROGRESSMONITOR_CONTROLNAME_PROGRESSBAR
"ProgressBar"
// -||-
#define PROGRESSMONITOR_DEFAULT_BUTTONLABEL
"Abbrechen"
- #define PROGRESSMONITOR_DEFAULT_TOPIC "\0"
+ #define PROGRESSMONITOR_DEFAULT_TOPIC
"\0"
#define PROGRESSMONITOR_DEFAULT_TEXT
"\0"
- #define PROGRESSMONITOR_BACKGROUNDCOLOR
UNOCONTROLS_TRGB_COLORDATA( 0x00, 0xC0, 0xC0, 0xC0 ) // lighgray
+ #define PROGRESSMONITOR_BACKGROUNDCOLOR
UNOCONTROLS_TRGB_COLORDATA( 0x00, 0xC0, 0xC0, 0xC0 ) // lightgray
#define PROGRESSMONITOR_LINECOLOR_BRIGHT
UNOCONTROLS_TRGB_COLORDATA( 0x00, 0xFF, 0xFF, 0xFF ) // white
#define PROGRESSMONITOR_LINECOLOR_SHADOW
UNOCONTROLS_TRGB_COLORDATA( 0x00, 0x00, 0x00, 0x00 ) // black
#define PROGRESSMONITOR_HEIGHT_PROGRESSBAR
15
@@ -129,3 +127,5 @@ namespace unocontrols{
} // namespace unocontrols
#endif // #ifndef _UNOCONTROLS_DEFINES_CTRL_HXX
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/UnoControls/source/controls/framecontrol.cxx
b/main/UnoControls/source/controls/framecontrol.cxx
index 24ecdcac9f..758d9edbac 100644
--- a/main/UnoControls/source/controls/framecontrol.cxx
+++ b/main/UnoControls/source/controls/framecontrol.cxx
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
//______________________________________________________________________________________________________________
// my own include
//______________________________________________________________________________________________________________
diff --git a/main/UnoControls/source/inc/framecontrol.hxx
b/main/UnoControls/source/inc/framecontrol.hxx
index bafa64121a..8b7e8a8d80 100644
--- a/main/UnoControls/source/inc/framecontrol.hxx
+++ b/main/UnoControls/source/inc/framecontrol.hxx
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
#ifndef _UNOCONTROLS_FRAMECONTROL_CTRL_HXX
#define _UNOCONTROLS_FRAMECONTROL_CTRL_HXX
@@ -86,7 +84,7 @@ namespace unocontrols{
#define PROPERTYNAME_COMPONENTURL
"ComponentURL"
#define PROPERTYNAME_FRAME
"Frame"
#define ERRORTEXT_VOSENSHURE
"This is an invalid property handle."
-#define PROPERTY_COUNT
3
// you must count the propertys
+#define PROPERTY_COUNT
3
// you must count the properties
#define PROPERTYHANDLE_COMPONENTURL
0
// Id must be the index into the array
#define PROPERTYHANDLE_FRAME
1
#define PROPERTYHANDLE_LOADERARGUMENTS 2
@@ -618,3 +616,5 @@ private:
} // namespace unocontrols
#endif // #ifndef _UNOCONTROLS_FRAMECONTROL_CTRL_HXX
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/avmedia/source/macavf/macavf_common.hxx
b/main/avmedia/source/macavf/macavf_common.hxx
index ef28f9339a..809331813f 100644
--- a/main/avmedia/source/macavf/macavf_common.hxx
+++ b/main/avmedia/source/macavf/macavf_common.hxx
@@ -42,7 +42,6 @@
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/uno/RuntimeException.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/registry/XRegistryKey.hpp>
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -51,7 +50,6 @@
#include <com/sun/star/awt/MouseButton.hpp>
#include <com/sun/star/media/XManager.hpp>
-
#define AVMEDIA_MACAVF_MANAGER_IMPLEMENTATIONNAME
"com.sun.star.comp.avmedia.Manager_MacAVF"
#define AVMEDIA_MACAVF_MANAGER_SERVICENAME "com.sun.star.media.Manager_MacAVF"
@@ -77,12 +75,14 @@ namespace avmedia { namespace macavf {
class MacAVObserverHandler
{
private:
- static MacAVObserverObject* mpMacAVObserverObject;
+ static MacAVObserverObject* mpMacAVObserverObject;
public:
- MacAVObserverObject* getObserver( void ) const;
- virtual bool handleObservation( NSString* pKeyPath ) = 0;
+ MacAVObserverObject* getObserver( void ) const;
+ virtual bool handleObservation( NSString* pKeyPath ) = 0;
};
}}
#endif // MACAVF_COMMON_HXX
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/connectivity/source/drivers/dbase/DTables.cxx
b/main/connectivity/source/drivers/dbase/DTables.cxx
index 2730818464..9b2d2a037d 100644
--- a/main/connectivity/source/drivers/dbase/DTables.cxx
+++ b/main/connectivity/source/drivers/dbase/DTables.cxx
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_connectivity.hxx"
#include "dbase/DTables.hxx"
@@ -97,7 +95,7 @@ sdbcx::ObjectType ODbaseTables::appendObject( const
::rtl::OUString& _rForName,
}
}
}
- return createObject( _rForName );
+ return createObject( _rForName );
}
// -------------------------------------------------------------------------
// XDrop
@@ -121,13 +119,13 @@ void ODbaseTables::dropObject(sal_Int32 _nPos,const
::rtl::OUString _sElementNam
pTable->DropImpl();
}
else
- {
- const ::rtl::OUString sError(
static_cast<OFileCatalog&>(m_rParent).getConnection()->getResources().getResourceStringWithSubstitution(
- STR_TABLE_NOT_DROP,
- "$tablename$", _sElementName
- ) );
- ::dbtools::throwGenericSQLException( sError, NULL );
- }
+ {
+ const ::rtl::OUString sError(
static_cast<OFileCatalog&>(m_rParent).getConnection()->getResources().getResourceStringWithSubstitution(
+ STR_TABLE_NOT_DROP,
+ "$tablename$", _sElementName
+ ) );
+ ::dbtools::throwGenericSQLException( sError, NULL );
+ }
}
// -------------------------------------------------------------------------
Any SAL_CALL ODbaseTables::queryInterface( const Type & rType )
throw(RuntimeException)
@@ -136,3 +134,5 @@ Any SAL_CALL ODbaseTables::queryInterface( const Type &
rType ) throw(RuntimeExc
return OTables_BASE::queryInterface(rType);
}
//
-----------------------------------------------------------------------------
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/extensions/source/dbpilots/dbpilots.src
b/main/extensions/source/dbpilots/dbpilots.src
index 94d3a37966..42e1785d59 100644
--- a/main/extensions/source/dbpilots/dbpilots.src
+++ b/main/extensions/source/dbpilots/dbpilots.src
@@ -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,71 +7,69 @@
* 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.
- *
+ *
*************************************************************/
-
-
#ifndef _EXTENSIONS_DBP_DBPRESID_HRC_
#include "dbpresid.hrc"
#endif
ModalDialog RID_DLG_GROUPBOXWIZARD
{
- HelpID = "extensions:ModalDialog:RID_DLG_GROUPBOXWIZARD";
- Text [ en-US ] = "Group Element Wizard";
+ HelpID = "extensions:ModalDialog:RID_DLG_GROUPBOXWIZARD" ;
+ Text [ en-US ] = "Group Element Wizard" ;
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Moveable = TRUE ;
- Closeable = TRUE ;
- Hide = TRUE;
+ OutputSize = TRUE ;
+ SVLook = TRUE ;
+ Moveable = TRUE ;
+ Closeable = TRUE ;
+ Hide = TRUE ;
};
ModalDialog RID_DLG_LISTCOMBOWIZARD
{
- HelpID = "extensions:ModalDialog:RID_DLG_LISTCOMBOWIZARD";
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Moveable = TRUE ;
- Closeable = TRUE ;
- Hide = TRUE;
+ HelpID = "extensions:ModalDialog:RID_DLG_LISTCOMBOWIZARD" ;
+ OutputSize = TRUE ;
+ SVLook = TRUE ;
+ Moveable = TRUE ;
+ Closeable = TRUE ;
+ Hide = TRUE ;
};
ModalDialog RID_DLG_GRIDWIZARD
{
- HelpID = "extensions:ModalDialog:RID_DLG_GRIDWIZARD";
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Moveable = TRUE ;
- Closeable = TRUE ;
- Hide = TRUE;
+ HelpID = "extensions:ModalDialog:RID_DLG_GRIDWIZARD" ;
+ OutputSize = TRUE ;
+ SVLook = TRUE ;
+ Moveable = TRUE ;
+ Closeable = TRUE ;
+ Hide = TRUE ;
- Text [ en-US ] = "Table Element Wizard";
+ Text [ en-US ] = "Table Element Wizard" ;
};
String RID_STR_LISTWIZARD_TITLE
{
- Text [ en-US ] = "List Box Wizard";
+ Text [ en-US ] = "List Box Wizard" ;
};
String RID_STR_COMBOWIZARD_TITLE
{
- Text [ en-US ] = "Combo Box Wizard";
+ Text [ en-US ] = "Combo Box Wizard" ;
};
String RID_STR_COULDNOTOPENTABLE
{
- Text [ en-US ] = "The table connection to the data source could not be
established.";
+ Text [ en-US ] = "The table connection to the data source could not be
established." ;
};
-
+// ********************************************************************** EOF
diff --git a/main/extensions/source/dbpilots/gridpages.src
b/main/extensions/source/dbpilots/gridpages.src
index 68ee99a8c1..59d34297ed 100644
--- a/main/extensions/source/dbpilots/gridpages.src
+++ b/main/extensions/source/dbpilots/gridpages.src
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
#ifndef _EXTENSIONS_DBP_DBPRESID_HRC_
#include "dbpresid.hrc"
#endif
diff --git a/main/extensions/source/dbpilots/groupboxpages.src
b/main/extensions/source/dbpilots/groupboxpages.src
index a559f92874..06e679cdbf 100644
--- a/main/extensions/source/dbpilots/groupboxpages.src
+++ b/main/extensions/source/dbpilots/groupboxpages.src
@@ -101,7 +101,6 @@ TabPage RID_PAGE_DEFAULTFIELDSELECTION
Pos = MAP_APPFONT ( 7, 15 ) ;
Size = MAP_APPFONT ( WINDOW_SIZE_X - 14, 24 ) ;
WordBreak = TRUE ;
-
Text [ en-US ] = "Should one option field be selected as a
default?" ;
};
RadioButton RB_DEFSELECTION_YES
diff --git a/main/extensions/source/dbpilots/listcombopages.src
b/main/extensions/source/dbpilots/listcombopages.src
index 405c66c9ad..f5279ae321 100644
--- a/main/extensions/source/dbpilots/listcombopages.src
+++ b/main/extensions/source/dbpilots/listcombopages.src
@@ -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,201 +7,184 @@
* 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.
- *
+ *
*************************************************************/
-
-
#ifndef _EXTENSIONS_DBP_DBPRESID_HRC_
#include "dbpresid.hrc"
#endif
TabPage RID_PAGE_LCW_CONTENTSELECTION_TABLE
{
- HelpID = "extensions:TabPage:RID_PAGE_LCW_CONTENTSELECTION_TABLE";
+ HelpID = "extensions:TabPage:RID_PAGE_LCW_CONTENTSELECTION_TABLE" ;
SVLook = TRUE ;
- Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ;
+ Size = MAP_APPFONT ( WINDOW_SIZE_X, WINDOW_SIZE_Y ) ;
- Text [ en-US ] = "Table Selection";
+ Text [ en-US ] = "Table Selection" ;
FixedLine FL_FRAME
{
- Pos = MAP_APPFONT ( 4 , 40 ) ;
- Size = MAP_APPFONT ( WINDOW_SIZE_X - 8 , 8 ) ;
- Text [ en-US ] = "Control";
+ Pos = MAP_APPFONT ( 4, 40 ) ;
+ Size = MAP_APPFONT ( WINDOW_SIZE_X - 8, 8 ) ;
+ Text [ en-US ] = "Control" ;
};
FixedText FT_SELECTTABLE_LABEL
{
- Pos = MAP_APPFONT ( 7 , 52 ) ;
+ Pos = MAP_APPFONT ( 7, 52 ) ;
Size = MAP_APPFONT ( 120, WINDOW_SIZE_Y - 21 ) ;
- WordBreak = TRUE;
- Group = TRUE;
- Text [ en-US ] = "On the right side, you see all the tables
from the data source of the form.\n\n\nChoose the table from which the data
should be used as basis for the list content:";
+ WordBreak = TRUE ;
+ Group = TRUE ;
+ Text [ en-US ] = "On the right side, you see all the tables
from the data source of the form.\n\n\nChoose the table from which the data
should be used as basis for the list content:" ;
};
ListBox LB_SELECTTABLE
{
- HelpID =
"extensions:ListBox:RID_PAGE_LCW_CONTENTSELECTION_TABLE:LB_SELECTTABLE";
- Pos = MAP_APPFONT ( 130 , 52 ) ;
+ HelpID =
"extensions:ListBox:RID_PAGE_LCW_CONTENTSELECTION_TABLE:LB_SELECTTABLE" ;
+ Pos = MAP_APPFONT ( 130, 52 ) ;
Size = MAP_APPFONT ( WINDOW_SIZE_X - 130 - 7, WINDOW_SIZE_Y -
52 - 6 ) ;
SVLook = TRUE ;
Border = TRUE ;
AutoHScroll = TRUE ;
- Sort = FALSE;
- DropDown = FALSE;
+ Sort = FALSE ;
+ DropDown = FALSE ;
};
};
TabPage RID_PAGE_LCW_CONTENTSELECTION_FIELD
{
- HelpID = "extensions:TabPage:RID_PAGE_LCW_CONTENTSELECTION_FIELD";
+ HelpID = "extensions:TabPage:RID_PAGE_LCW_CONTENTSELECTION_FIELD" ;
SVLook = TRUE ;
- Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ;
+ Size = MAP_APPFONT ( WINDOW_SIZE_X, WINDOW_SIZE_Y ) ;
- Text [ en-US ] = "Field Selection";
+ Text [ en-US ] = "Field Selection" ;
FixedLine FL_FRAME
{
- Pos = MAP_APPFONT ( 4 , 3 ) ;
- Size = MAP_APPFONT ( WINDOW_SIZE_X - 8 , 8 ) ;
+ Pos = MAP_APPFONT ( 4, 3 ) ;
+ Size = MAP_APPFONT ( WINDOW_SIZE_X - 8, 8 ) ;
};
FixedText FT_TABLEFIELDS
{
- Pos = MAP_APPFONT ( 7 , 15 ) ;
+ Pos = MAP_APPFONT ( 7, 15 ) ;
Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - 3, 8 ) ;
- WordBreak = TRUE;
- Group = TRUE;
- Text [ en-US ] = "Existing fields";
+ WordBreak = TRUE ;
+ Group = TRUE ;
+ Text [ en-US ] = "Existing fields" ;
};
ListBox LB_SELECTFIELD
{
- HelpID =
"extensions:ListBox:RID_PAGE_LCW_CONTENTSELECTION_FIELD:LB_SELECTFIELD";
- Pos = MAP_APPFONT ( 7 , 26 ) ;
+ HelpID =
"extensions:ListBox:RID_PAGE_LCW_CONTENTSELECTION_FIELD:LB_SELECTFIELD" ;
+ Pos = MAP_APPFONT ( 7, 26 ) ;
Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - 10, WINDOW_SIZE_Y -
32 ) ;
SVLook = TRUE ;
Border = TRUE ;
AutoHScroll = TRUE ;
- Sort = FALSE;
- DropDown = FALSE;
+ Sort = FALSE ;
+ DropDown = FALSE ;
};
FixedText FT_DISPLAYEDFIELD
{
- Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X + 3 , 15 ) ;
+ Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X + 3, 15 ) ;
Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - 10, 8 ) ;
- Text [ en-US ] = "Display field";
+ Text [ en-US ] = "Display field" ;
};
Edit ET_DISPLAYEDFIELD
{
- HelpID =
"extensions:Edit:RID_PAGE_LCW_CONTENTSELECTION_FIELD:ET_DISPLAYEDFIELD";
- Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X + 3 , 26 ) ;
+ HelpID =
"extensions:Edit:RID_PAGE_LCW_CONTENTSELECTION_FIELD:ET_DISPLAYEDFIELD" ;
+ Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X + 3, 26 ) ;
Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - 10, 12 ) ;
SVLook = TRUE ;
Border = TRUE ;
- ReadOnly = TRUE;
+ ReadOnly = TRUE ;
};
FixedText FT_CONTENTFIELD_INFO
{
- Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X + 3 , 45 ) ;
+ Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X + 3, 45 ) ;
Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - 10, WINDOW_SIZE_Y -
51 ) ;
- WordBreak = TRUE;
+ WordBreak = TRUE ;
};
String STR_FIELDINFO_COMBOBOX
{
- Text [ en-US ] = "The contents of the field selected will be
shown in the combo box list.";
+ Text [ en-US ] = "The contents of the field selected will be
shown in the combo box list." ;
};
String STR_FIELDINFO_LISTBOX
{
- Text [ en-US ] = "The contents of the selected field will be
shown in the list box if the linked fields are identical.";
+ Text [ en-US ] = "The contents of the selected field will be
shown in the list box if the linked fields are identical." ;
};
};
TabPage RID_PAGE_LCW_FIELDLINK
{
- HelpID = "extensions:TabPage:RID_PAGE_LCW_FIELDLINK";
+ HelpID = "extensions:TabPage:RID_PAGE_LCW_FIELDLINK" ;
SVLook = TRUE ;
- Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ;
+ Size = MAP_APPFONT ( WINDOW_SIZE_X, WINDOW_SIZE_Y ) ;
- Text [ en-US ] = "Field Link";
+ Text [ en-US ] = "Field Link" ;
FixedText FT_FIELDLINK_DESC
{
- Pos = MAP_APPFONT ( 7 , 6 ) ;
- Size = MAP_APPFONT ( WINDOW_SIZE_X - 14 , 16 ) ;
- WordBreak = TRUE;
- Text [ en-US ] = "This is where you select fields with matching
contents so that the value from the display field will be shown.";
+ Pos = MAP_APPFONT ( 7, 6 ) ;
+ Size = MAP_APPFONT ( WINDOW_SIZE_X - 14, 16 ) ;
+ WordBreak = TRUE ;
+ Text [ en-US ] = "This is where you select fields with matching
contents so that the value from the display field will be shown." ;
};
FixedLine FL_FRAME
{
- Pos = MAP_APPFONT ( 4 , 25 ) ;
- Size = MAP_APPFONT ( WINDOW_SIZE_X - 8 , 8 ) ;
+ Pos = MAP_APPFONT ( 4, 25 ) ;
+ Size = MAP_APPFONT ( WINDOW_SIZE_X - 8, 8 ) ;
};
FixedText FT_VALUELISTFIELD
{
- Pos = MAP_APPFONT ( 7 , 37 ) ;
+ Pos = MAP_APPFONT ( 7, 37 ) ;
Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - 10, 8 ) ;
- Group = TRUE;
- Text [ en-US ] = "Field from the ~Value Table";
+ Group = TRUE ;
+ Text [ en-US ] = "Field from the ~Value Table" ;
};
ComboBox CMB_VALUELISTFIELD
{
- HelpID =
"extensions:ComboBox:RID_PAGE_LCW_FIELDLINK:CMB_VALUELISTFIELD";
- Pos = MAP_APPFONT ( 7 , 48 ) ;
+ HelpID =
"extensions:ComboBox:RID_PAGE_LCW_FIELDLINK:CMB_VALUELISTFIELD" ;
+ Pos = MAP_APPFONT ( 7, 48 ) ;
Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - 10, WINDOW_SIZE_Y -
54 ) ;
SVLook = TRUE ;
Border = TRUE ;
- DropDown = FALSE;
- Sort = FALSE;
- AutoHScroll = TRUE;
+ DropDown = FALSE ;
+ Sort = FALSE ;
+ AutoHScroll = TRUE ;
};
FixedText FT_TABLEFIELD
{
- Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X + 3 , 37 ) ;
+ Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X + 3, 37 ) ;
Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - 10, 8 ) ;
- Group = TRUE;
- Text [ en-US ] = "Field from the ~List Table";
+ Group = TRUE ;
+ Text [ en-US ] = "Field from the ~List Table" ;
};
ComboBox CMB_TABLEFIELD
{
- HelpID =
"extensions:ComboBox:RID_PAGE_LCW_FIELDLINK:CMB_TABLEFIELD";
- Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X + 3 , 48 ) ;
+ HelpID =
"extensions:ComboBox:RID_PAGE_LCW_FIELDLINK:CMB_TABLEFIELD" ;
+ Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X + 3, 48 ) ;
Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - 10, WINDOW_SIZE_Y -
54 ) ;
SVLook = TRUE ;
Border = TRUE ;
- DropDown = FALSE;
- Sort = FALSE;
- AutoHScroll = TRUE;
+ DropDown = FALSE ;
+ Sort = FALSE ;
+ AutoHScroll = TRUE ;
};
};
String RID_STR_COMBOWIZ_DBFIELD
{
- Text [ en-US ] = "You can either save the value of the combo box in a
database field or use it for display purposes.";
+ Text [ en-US ] = "You can either save the value of the combo box in a
database field or use it for display purposes." ;
};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+// ********************************************************************** EOF
diff --git a/main/oox/inc/oox/xls/formulabase.hxx
b/main/oox/inc/oox/xls/formulabase.hxx
index 98458f92e9..fa6b34ae9e 100644
--- a/main/oox/inc/oox/xls/formulabase.hxx
+++ b/main/oox/inc/oox/xls/formulabase.hxx
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
#ifndef OOX_XLS_FORMULABASE_HXX
#define OOX_XLS_FORMULABASE_HXX
@@ -35,8 +33,8 @@
#include "oox/xls/addressconverter.hxx"
namespace com { namespace sun { namespace star {
- namespace sheet { class XFormulaOpCodeMapper; }
- namespace sheet { class XFormulaParser; }
+ namespace sheet { class XFormulaOpCodeMapper; }
+ namespace sheet { class XFormulaParser; }
} } }
namespace oox { template< typename Type > class Matrix; }
@@ -459,7 +457,7 @@ enum FuncParamConversion
(unary and binary arithmetic operators, comparison operators, and range
operators). It is not used for function parameters. On conversion, it
will be replaced by the last conversion type that was not the RPO
- conversion. This leads to a slightly different behaviour than the RPT
+ conversion. This leads to a slightly different behavior than the RPT
conversion for operands in conjunction with a parent RPX conversion.
*/
struct FunctionParamInfo
@@ -866,7 +864,7 @@ public:
@param orTokens (input/output parameter) Expects a single string token
in this token sequence (whitespace tokens are allowed). The string
is split into substrings. A list of string tokens separated with
- parameter separator tokens is returned in this psrameter.
+ parameter separator tokens is returned in this parameter.
@param cStringSep The separator character used to split the input
string.
@@ -886,3 +884,5 @@ public:
} // namespace oox
#endif
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sd/source/filter/ppt/pptin.cxx
b/main/sd/source/filter/ppt/pptin.cxx
index e623526fbd..cd93188b55 100644
--- a/main/sd/source/filter/ppt/pptin.cxx
+++ b/main/sd/source/filter/ppt/pptin.cxx
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sd.hxx"
@@ -400,7 +398,7 @@ sal_Bool ImplSdPPTImport::Import()
{
sal_uInt32 i;
- nPropCount /= 6; // 6 propertys a
hyperlink
+ nPropCount /= 6; // 6 properties a
hyperlink
SdHyperlinkEntry* pHyperlink = 0;
for ( i = 0; i < nPropCount; i++ )
@@ -429,7 +427,7 @@ sal_Bool ImplSdPPTImport::Import()
break;
pHyperlink->nStartPos =
pHyperlink->nEndPos = -1;
- if ( pHyperlink->aSubAdress.Len() ) //
get the converted subadress
+ if ( pHyperlink->aSubAdress.Len() ) //
get the converted subaddress
{
sal_uInt32 nPageNumber = 0;
String aString(
pHyperlink->aSubAdress );
@@ -633,12 +631,12 @@ sal_Bool ImplSdPPTImport::Import()
if ( nMasterNum > 2 )
{
if ( ePgKind == PK_STANDARD )
- { // Standardseite: Neues Praesentationslayout
erzeugen
+ { // Standardseite: Neues Präsentationslayout
erzeugen
aLayoutName = String( SdResId(
STR_LAYOUT_DEFAULT_TITLE_NAME ) );
aLayoutName += String::CreateFromInt32(
(sal_Int32)( ( nMasterNum + 1 ) / 2 - 1 ) );
( (SdStyleSheetPool*)mpDoc->GetStyleSheetPool()
)->CreateLayoutStyleSheets( aLayoutName );
}
- else // Notizseite: Praesentationslayout von der
Standardseite verwenden
+ else // Notizseite: Präsentationslayout von der
Standardseite verwenden
aLayoutName = ( (SdPage*)mpDoc->GetMasterPage(
nMasterNum - 1 ) )->GetName();
}
pPage->SetName( aLayoutName );
@@ -1097,7 +1095,7 @@ sal_Bool ImplSdPPTImport::Import()
const PptSlideLayoutAtom* pSlideLayout = GetSlideLayoutAtom();
if ( pSlideLayout )
{
- switch ( pSlideLayout->eLayout ) //
Praesentationslayouts fuer Standard-Seiten
+ switch ( pSlideLayout->eLayout ) //
Präsentationslayouts für Standard-Seiten
{
case PPT_LAYOUT_TITLEANDBODYSLIDE :
{
@@ -1198,8 +1196,8 @@ sal_Bool ImplSdPPTImport::Import()
case PPT_LAYOUT_MASTERSLIDE : // Layout der
Standard- und Titel-MasterPage
case PPT_LAYOUT_TITLEMASTERSLIDE :
case PPT_LAYOUT_MASTERNOTES : // Layout der
Notizen-MasterPage
- case PPT_LAYOUT_NOTESTITLEBODY : //
Praesentationslayout fuer Notiz-Seiten
- case PPT_LAYOUT_HANDOUTLAYOUT : //
Praesentationslayout fuer Handzettelseiten
+ case PPT_LAYOUT_NOTESTITLEBODY : //
Präsentationslayout für Notiz-Seiten
+ case PPT_LAYOUT_HANDOUTLAYOUT : //
Präsentationslayout für Handzettelseiten
eAutoLayout = AUTOLAYOUT_NONE;
break;
}
@@ -1628,7 +1626,7 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage,
const sal_Bool bNewAnimat
if ( nDirection == 0 )
pPage->SetFadeEffect(
::com::sun::star::presentation::FadeEffect_NONE ); // Direkt
else if ( nDirection == 1 )
- pPage->SetFadeEffect(
::com::sun::star::presentation::FadeEffect_NONE ); // Direkt
ueber Schwarz
+ pPage->SetFadeEffect(
::com::sun::star::presentation::FadeEffect_NONE ); // Direkt
über Schwarz
}
else
pPage->setTransitionType( 0 );
@@ -1799,11 +1797,11 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage,
const sal_Bool bNewAnimat
}
if ( nSpeed == 0 )
- pPage->setTransitionDuration( 3.0 );
// langsam
+ pPage->setTransitionDuration( 3.0 ); //
slow
else if ( nSpeed == 1 )
- pPage->setTransitionDuration( 2.0 ); //
mittel
+ pPage->setTransitionDuration( 2.0 ); //
medium
else if ( nSpeed == 2 )
- pPage->setTransitionDuration( 1.0 );
// schnell
+ pPage->setTransitionDuration( 1.0 ); //
fast
if ( nBuildFlags & 0x400 )
// slidechange by time
{ // Standzeit (in Ticks)
@@ -1901,7 +1899,7 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage,
const sal_Bool bNewAnimat
// Import von Sounds
//
// Die Sounds werden nicht nur als String importiert sondern auch
-// in die Gallery einefuegt, falls dort noch nicht vorhanden.
+// in die Gallery eingefügt, falls dort noch nicht vorhanden.
//
///////////////////////////////////////////////////////////////////////////
@@ -1945,7 +1943,7 @@ String ImplSdPPTImport::ReadSound(sal_uInt32 nSoundRef)
const
}
if ( bDone )
{
- // ueberpruefen, ob diese Sound-Datei schon
+ // überprüfen, ob diese Sound-Datei schon
// existiert. Wenn nicht, exportiere diese
// in unser lokales Sound-Verzeichnis.
sal_Bool bSoundExists = sal_False;
@@ -2097,7 +2095,7 @@ void ImplSdPPTImport::FillSdAnimationInfo(
SdAnimationInfo* pInfo, PptInteractiv
pInfo->SetBookmark( ReadSound( pIAtom->nSoundRef ) ); // Pfad zum
Soundfile in MSDOS-Notation
pInfo->meClickAction =
::com::sun::star::presentation::ClickAction_SOUND; //
RunProgramAction
}
-// if ( nFlags & 0x01 ) // koennen wir nicht ( beim Anklicken markieren )
+// if ( nFlags & 0x01 ) // können wir nicht ( beim Anklicken markieren )
switch ( pIAtom->nAction )
{
// case 0x01 : // MacroAction
@@ -2408,8 +2406,8 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj*
pTextObj, SdrTextObj* pObj
sal_Bool bVertical = sal_False;
if ( ( pTextObj->GetShapeType() == mso_sptRectangle ) || (
pTextObj->GetShapeType() == mso_sptTextBox ) )
{
- //if a placeholder with some custom attribute,the
pTextObj will keep those attr,whose text size is zero,
- //so sdPage should renew a PresObj to process
placeholder.
+ // if a placeholder with some custom attribute,the
pTextObj will keep those attr, whose text size is zero,
+ // so sdPage should renew a PresObj to process
placeholder.
if ( pTextObj->Count() > 1 ||
( pTextObj->Count() == 1 &&(pTextObj->First()) &&
pTextObj->First()->GetTextSize()>0 ))
bEmptyPresObj = sal_False;
@@ -2786,19 +2784,21 @@ SdrObject* ImplSdPPTImport::ProcessObj( SvStream& rSt,
DffObjData& rObjData, voi
// ---------------------
extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL ImportPPT( const
::rtl::OUString& rConfigPath,
- uno::Sequence< beans::PropertyValue >* pConfigData,
- SdDrawDocument* pDocument, SvStream& rDocStream, SvStorage& rStorage,
SfxMedium& rMedium )
+ uno::Sequence< beans::PropertyValue >* pConfigData,
+ SdDrawDocument* pDocument, SvStream& rDocStream, SvStorage&
rStorage, SfxMedium& rMedium )
{
- sal_Bool bRet = sal_False;
+ sal_Bool bRet = sal_False;
- MSFilterTracer aTracer( rConfigPath, pConfigData );
- aTracer.StartTracing();
+ MSFilterTracer aTracer( rConfigPath, pConfigData );
+ aTracer.StartTracing();
- SdPPTImport* pImport = new SdPPTImport( pDocument, rDocStream, rStorage,
rMedium, &aTracer );
- bRet = pImport->Import();
+ SdPPTImport* pImport = new SdPPTImport( pDocument, rDocStream,
rStorage, rMedium, &aTracer );
+ bRet = pImport->Import();
- aTracer.EndTracing();
- delete pImport;
+ aTracer.EndTracing();
+ delete pImport;
- return bRet;
+ return bRet;
}
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sw/inc/pagepreviewlayout.hxx
b/main/sw/inc/pagepreviewlayout.hxx
index 4c7ef64f07..8252a2ee37 100644
--- a/main/sw/inc/pagepreviewlayout.hxx
+++ b/main/sw/inc/pagepreviewlayout.hxx
@@ -588,7 +588,7 @@ public:
@author OD
@param _nPageNum
- input parameter - pysical page number of preview page, for which the
+ input parameter - physical page number of preview page, for which the
page size has to be returned.
@return an object of class <Size>
@@ -602,7 +602,7 @@ public:
@author OD
@param _nPageNum
- input parameter - pysical page number of preview page, for which the
+ input parameter - physical page number of preview page, for which the
virtual page number has to be determined.
@return virtual page number of page given by its physical page number,
@@ -640,3 +640,5 @@ public:
};
#endif // _PAGEPREVIEWLAYOUT_HXX
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/vcl/source/gdi/pngread.cxx b/main/vcl/source/gdi/pngread.cxx
index e41f7c078e..78c3bc876e 100644
--- a/main/vcl/source/gdi/pngread.cxx
+++ b/main/vcl/source/gdi/pngread.cxx
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
@@ -149,7 +147,7 @@ private:
sal_Bool mbStatus;
sal_Bool mbIDAT; //
sal_True if finished with enough IDAT chunks
sal_Bool mbGamma; //
sal_True if Gamma Correction available
- sal_Bool mbpHYs; //
sal_True if pysical size of pixel available
+ sal_Bool mbpHYs; //
sal_True if physical size of pixel available
sal_Bool mbIgnoreGammaChunk;
#ifdef DBG_UTIL
@@ -1760,5 +1758,6 @@ void PNGReader::SetIgnoreGammaChunk( sal_Bool b )
mpImpl->SetIgnoreGammaChunk( b );
}
-
} // namespace vcl
+
+/* vim: set noet sw=4 ts=4: */
