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 ba0e87d7fb Cleanup
ba0e87d7fb is described below
commit ba0e87d7fb911293fa8d9f5b3416d4d04511ac24
Author: mseidel <[email protected]>
AuthorDate: Sat Apr 19 00:20:32 2025 +0200
Cleanup
(cherry picked from commit b3897e6aa10c44e4a3a28a6e1f45e38816be3d7f)
---
main/automation/source/simplecm/tcpio.hxx | 25 +++---
main/basebmp/inc/basebmp/nonstandarditerator.hxx | 26 +++---
main/cui/source/dialogs/hyphen.src | 94 +++++++++++-----------
main/cui/source/dialogs/thesdlg.src | 8 +-
main/forms/source/xforms/boolexpression.hxx | 22 ++---
main/sd/source/filter/html/pubdlg.src | 14 ++--
main/sd/source/ui/dlg/LayerDialog.src | 2 +-
main/sfx2/source/appl/newhelp.src | 6 +-
.../source/engine/transitions/barndoorwipe.hxx | 25 +++---
.../engine/transitions/barwipepolypolygon.hxx | 29 ++++---
.../source/engine/transitions/checkerboardwipe.hxx | 29 ++++---
.../source/engine/transitions/clockwipe.hxx | 21 +++--
.../source/engine/transitions/ellipsewipe.hxx | 19 +++--
.../source/engine/transitions/fanwipe.hxx | 23 +++---
.../source/engine/transitions/fourboxwipe.hxx | 27 +++----
.../source/engine/transitions/iriswipe.hxx | 21 +++--
.../source/engine/transitions/pinwheelwipe.hxx | 20 ++---
.../source/engine/transitions/transitiontools.hxx | 23 +++---
.../source/engine/transitions/veewipe.hxx | 19 +++--
.../source/engine/transitions/zigzagwipe.hxx | 29 ++++---
main/sw/source/ui/app/app.src | 2 +-
main/sw/source/ui/config/optload.src | 8 +-
main/sw/source/ui/fldui/fldui.src | 18 ++---
main/sw/source/ui/fldui/fldvar.src | 4 +-
main/sw/source/ui/frmdlg/cption.src | 4 +-
main/toolkit/source/awt/vclxwindow1.cxx | 82 +++++++++----------
26 files changed, 285 insertions(+), 315 deletions(-)
diff --git a/main/automation/source/simplecm/tcpio.hxx
b/main/automation/source/simplecm/tcpio.hxx
index e1611f826f..408a13725f 100644
--- a/main/automation/source/simplecm/tcpio.hxx
+++ b/main/automation/source/simplecm/tcpio.hxx
@@ -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,20 +7,18 @@
* 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 TCPIO_HXX
#define TCPIO_HXX
@@ -33,25 +31,26 @@ class TCPIO : public ITransmiter, public IReceiver
{
private:
vos::OStreamSocket *pStreamSocket;
- vos::OMutex aMSocketReadAccess;
- vos::OMutex aMSocketWriteAccess;
+ vos::OMutex aMSocketReadAccess;
+ vos::OMutex aMSocketWriteAccess;
public:
- ///
+ //
TCPIO( vos::OStreamSocket *pSocket ):pStreamSocket( pSocket ){}
virtual ~TCPIO(){}
-
- /// implement ITransmiter
+ // implement ITransmiter
virtual comm_USHORT TransferBytes( const void* pBuffer, comm_UINT32
nLen );
- /// implement IReceiver
+ // implement IReceiver
virtual comm_USHORT ReceiveBytes( void* pBuffer, comm_UINT32 nLen );
- // helper
+ // helper
void SetStreamSocket( vos::OStreamSocket *pSocket );
};
#endif
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/basebmp/inc/basebmp/nonstandarditerator.hxx
b/main/basebmp/inc/basebmp/nonstandarditerator.hxx
index b4fef907af..93fb974958 100644
--- a/main/basebmp/inc/basebmp/nonstandarditerator.hxx
+++ b/main/basebmp/inc/basebmp/nonstandarditerator.hxx
@@ -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,20 +7,18 @@
* 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 INCLUDED_BASEBMP_NONSTANDARDITERATOR_HXX
#define INCLUDED_BASEBMP_NONSTANDARDITERATOR_HXX
@@ -28,14 +26,16 @@
namespace basebmp
{
- /// Base class defining pointer and reference types as VigraFalseType
- struct NonStandardIterator
- {
- typedef vigra::VigraFalseType reference;
- typedef vigra::VigraFalseType index_reference;
- typedef vigra::VigraFalseType pointer;
- };
+ // Base class defining pointer and reference types as VigraFalseType
+ struct NonStandardIterator
+ {
+ typedef vigra::VigraFalseType reference;
+ typedef vigra::VigraFalseType index_reference;
+ typedef vigra::VigraFalseType pointer;
+ };
} // namespace basebmp
#endif /* INCLUDED_BASEBMP_NONSTANDARDITERATOR_HXX */
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/cui/source/dialogs/hyphen.src
b/main/cui/source/dialogs/hyphen.src
index 2ffe154e1a..baca067d5b 100644
--- a/main/cui/source/dialogs/hyphen.src
+++ b/main/cui/source/dialogs/hyphen.src
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
// include ---------------------------------------------------------------
#include "helpid.hrc"
#include "cuires.hrc"
@@ -43,83 +41,83 @@ ModalDialog RID_SVXDLG_HYPHENATE
FixedText FT_WORD
{
- Pos = MAP_APPFONT ( 5, 5 ) ;
- Size = MAP_APPFONT ( 120, 8 ) ;
- Text [ en-US ] = "~Word" ;
+ Pos = MAP_APPFONT ( 5, 5 ) ;
+ Size = MAP_APPFONT ( 120, 8 ) ;
+ Text [ en-US ] = "~Word" ;
};
Edit ED_WORD
{
- HelpID = "cui:Edit:RID_SVXDLG_HYPHENATE:ED_WORD" ;
- BORDER = TRUE ;
- Pos = MAP_APPFONT ( 5, 17 ) ;
- Size = MAP_APPFONT ( 132, 12 ) ;
+ HelpID = "cui:Edit:RID_SVXDLG_HYPHENATE:ED_WORD" ;
+ Border = TRUE ;
+ Pos = MAP_APPFONT ( 5, 17 ) ;
+ Size = MAP_APPFONT ( 132, 12 ) ;
TABSTOP = TRUE ;
LEFT = TRUE ;
};
ImageButton BTN_LEFT
{
- HelpID = "cui:ImageButton:RID_SVXDLG_HYPHENATE:BTN_LEFT" ;
- Pos = MAP_APPFONT ( 56, 33 ) ;
+ HelpID = "cui:ImageButton:RID_SVXDLG_HYPHENATE:BTN_LEFT" ;
+ Pos = MAP_APPFONT ( 56, 33 ) ;
Size = MAP_APPFONT ( 14, 14 ) ;
TABSTOP = TRUE ;
SYMBOL = IMAGEBUTTON_ARROW_LEFT ;
};
ImageButton BTN_RIGHT
{
- HelpID = "cui:ImageButton:RID_SVXDLG_HYPHENATE:BTN_RIGHT" ;
- Pos = MAP_APPFONT ( 75, 33 ) ;
+ HelpID = "cui:ImageButton:RID_SVXDLG_HYPHENATE:BTN_RIGHT" ;
+ Pos = MAP_APPFONT ( 75, 33 ) ;
Size = MAP_APPFONT ( 14, 14 ) ;
TABSTOP = TRUE ;
Symbol = IMAGEBUTTON_ARROW_RIGHT ;
};
- OKButton BTN_HYPH_CUT
- {
- Pos = MAP_APPFONT ( 144, 17 ) ;
- Size = MAP_APPFONT ( 50, 14 ) ;
- Text [ en-US ] = "H~yphenate" ;
- TABSTOP = TRUE ;
- DEFBUTTON = TRUE ;
- };
+ OKButton BTN_HYPH_CUT
+ {
+ Pos = MAP_APPFONT ( 144, 17 ) ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
+ Text [ en-US ] = "H~yphenate" ;
+ TABSTOP = TRUE ;
+ DEFBUTTON = TRUE ;
+ };
PushButton BTN_HYPH_CONTINUE
{
- HelpID = "cui:PushButton:RID_SVXDLG_HYPHENATE:BTN_HYPH_CONTINUE" ;
- Pos = MAP_APPFONT ( 144, 35 ) ;
- Size = MAP_APPFONT ( 50, 14 ) ;
- Text [ en-US ] = "~Skip" ;
+ HelpID =
"cui:PushButton:RID_SVXDLG_HYPHENATE:BTN_HYPH_CONTINUE" ;
+ Pos = MAP_APPFONT ( 144, 35 ) ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
+ Text [ en-US ] = "~Skip" ;
TABSTOP = TRUE ;
};
PushButton BTN_HYPH_DELETE
{
- HelpID = "cui:PushButton:RID_SVXDLG_HYPHENATE:BTN_HYPH_DELETE" ;
- Pos = MAP_APPFONT ( 144, 52 ) ;
+ HelpID = "cui:PushButton:RID_SVXDLG_HYPHENATE:BTN_HYPH_DELETE" ;
+ Pos = MAP_APPFONT ( 144, 52 ) ;
Size = MAP_APPFONT ( 50, 14 ) ;
Text [ en-US ] = "~Remove" ;
TABSTOP = TRUE ;
};
- FixedLine FL_BOTTOM
- {
- Pos = MAP_APPFONT ( 0, 81 ) ;
- Size = MAP_APPFONT ( 200, 8 ) ;
- };
- HelpButton BTN_HYPH_HELP
- {
- Pos = MAP_APPFONT ( 5, 93 ) ;
- Size = MAP_APPFONT ( 50, 14 ) ;
- TABSTOP = TRUE ;
- };
- PushButton BTN_HYPH_ALL
- {
- HelpID = "cui:PushButton:RID_SVXDLG_HYPHENATE:BTN_HYPH_ALL" ;
- Pos = MAP_APPFONT ( 63, 93 ) ;
- Size = MAP_APPFONT ( 74, 14 ) ;
- Text [ en-US ] = "Hyphenate ~All" ;
- TABSTOP = TRUE ;
- };
+ FixedLine FL_BOTTOM
+ {
+ Pos = MAP_APPFONT ( 0, 81 ) ;
+ Size = MAP_APPFONT ( 200, 8 ) ;
+ };
+ HelpButton BTN_HYPH_HELP
+ {
+ Pos = MAP_APPFONT ( 5, 93 ) ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
+ TABSTOP = TRUE ;
+ };
+ PushButton BTN_HYPH_ALL
+ {
+ HelpID = "cui:PushButton:RID_SVXDLG_HYPHENATE:BTN_HYPH_ALL" ;
+ Pos = MAP_APPFONT ( 63, 93 ) ;
+ Size = MAP_APPFONT ( 74, 14 ) ;
+ Text [ en-US ] = "Hyphenate ~All" ;
+ TABSTOP = TRUE ;
+ };
CancelButton BTN_HYPH_CANCEL
{
- Pos = MAP_APPFONT ( 144, 93 ) ;
+ Pos = MAP_APPFONT ( 144, 93 ) ;
Size = MAP_APPFONT ( 50, 14 ) ;
- Text [ en-US ] = "~Close" ;
+ Text [ en-US ] = "~Close" ;
TABSTOP = TRUE ;
};
};
diff --git a/main/cui/source/dialogs/thesdlg.src
b/main/cui/source/dialogs/thesdlg.src
index 2177c728d6..38924b7354 100644
--- a/main/cui/source/dialogs/thesdlg.src
+++ b/main/cui/source/dialogs/thesdlg.src
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
#include "cuires.hrc"
#include "thesdlg.hrc"
#include "helpid.hrc"
@@ -40,7 +38,7 @@ ModalDialog RID_SVXDLG_THESAURUS
{
Pos = MAP_APPFONT ( 0, 0 ) ;
Size = MAP_APPFONT ( 235, 0 ) ; // correct size will be applied
at runtime
- Hide = TRUE;
+ Hide = TRUE ;
};
ImageButton BTN_LEFT
@@ -85,7 +83,7 @@ ModalDialog RID_SVXDLG_THESAURUS
HelpID = HID_CT_THES_ALTERNATIVES ; // also needed for
automatic testing to find the control
Pos = MAP_APPFONT ( 5, 45 ) ;
Size = MAP_APPFONT ( 225, 121 ) ;
- Border = TRUE;
+ Border = TRUE ;
TabStop = TRUE ;
};
@@ -99,7 +97,7 @@ ModalDialog RID_SVXDLG_THESAURUS
Edit ED_REPL
{
HelpID = "cui:Edit:RID_SVXDLG_THESAURUS:ED_REPL" ;
- BORDER = TRUE ;
+ Border = TRUE ;
Pos = MAP_APPFONT ( 5, 184 ) ;
Size = MAP_APPFONT ( 225, 12 ) ;
LEFT = TRUE ;
diff --git a/main/forms/source/xforms/boolexpression.hxx
b/main/forms/source/xforms/boolexpression.hxx
index 3147f85e8b..841b9c4449 100644
--- a/main/forms/source/xforms/boolexpression.hxx
+++ b/main/forms/source/xforms/boolexpression.hxx
@@ -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,20 +7,18 @@
* 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 _BOOLEXPRESSION_HXX
#define _BOOLEXPRESSION_HXX
@@ -38,14 +36,16 @@ namespace xforms
class BoolExpression : public ComputedExpression
{
public:
- BoolExpression();
- ~BoolExpression();
+ BoolExpression();
+ ~BoolExpression();
- /// set the expression string
- /// (overridden for new definition of a simple expression)
- void setExpression( const rtl::OUString& rExpression );
+ // set the expression string
+ // (overridden for new definition of a simple expression)
+ void setExpression( const rtl::OUString& rExpression );
};
} // namespace xforms
#endif
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sd/source/filter/html/pubdlg.src
b/main/sd/source/filter/html/pubdlg.src
index d958be7f64..f2bb23433a 100644
--- a/main/sd/source/filter/html/pubdlg.src
+++ b/main/sd/source/filter/html/pubdlg.src
@@ -315,7 +315,7 @@ ModalDialog DLG_PUBLISHING
Edit PAGE2_INDEX
{
HelpID = "sd:Edit:DLG_PUBLISHING:PAGE2_INDEX" ;
- BORDER = TRUE ;
+ Border = TRUE ;
Pos = MAP_APPFONT ( 154, 88 ) ;
Size = MAP_APPFONT ( 105, 12 ) ;
Left = TRUE ;
@@ -331,7 +331,7 @@ ModalDialog DLG_PUBLISHING
Edit PAGE2_URL
{
HelpID = "sd:Edit:DLG_PUBLISHING:PAGE2_URL" ;
- BORDER = TRUE ;
+ Border = TRUE ;
Pos = MAP_APPFONT ( 154, 116 ) ;
Size = MAP_APPFONT ( 105, 12 ) ;
LEFT = TRUE ;
@@ -347,7 +347,7 @@ ModalDialog DLG_PUBLISHING
Edit PAGE2_CGI
{
HelpID = "sd:Edit:DLG_PUBLISHING:PAGE2_CGI" ;
- BORDER = TRUE ;
+ Border = TRUE ;
Pos = MAP_APPFONT ( 154, 144 ) ;
Size = MAP_APPFONT ( 105, 12 ) ;
LEFT = TRUE ;
@@ -504,7 +504,7 @@ ModalDialog DLG_PUBLISHING
Edit PAGE4_AUTHOR
{
HelpID = "sd:Edit:DLG_PUBLISHING:PAGE4_AUTHOR" ;
- BORDER = TRUE ;
+ Border = TRUE ;
Pos = MAP_APPFONT ( 136, 49 ) ;
Size = MAP_APPFONT ( 128, 12 ) ;
LEFT = TRUE ;
@@ -520,7 +520,7 @@ ModalDialog DLG_PUBLISHING
Edit PAGE4_EMAIL_EDIT
{
HelpID = "sd:Edit:DLG_PUBLISHING:PAGE4_EMAIL_EDIT" ;
- BORDER = TRUE ;
+ Border = TRUE ;
Pos = MAP_APPFONT ( 136, 65 ) ;
Size = MAP_APPFONT ( 128, 12 ) ;
LEFT = TRUE ;
@@ -536,7 +536,7 @@ ModalDialog DLG_PUBLISHING
Edit PAGE4_WWW_EDIT
{
HelpID = "sd:Edit:DLG_PUBLISHING:PAGE4_WWW_EDIT" ;
- BORDER = TRUE ;
+ Border = TRUE ;
Pos = MAP_APPFONT ( 136, 81 ) ;
Size = MAP_APPFONT ( 128, 12 ) ;
LEFT = TRUE ;
@@ -765,7 +765,7 @@ ModalDialog DLG_DESIGNNAME
Edit EDT_NAME
{
HelpID = "sd:Edit:DLG_DESIGNNAME:EDT_NAME" ;
- BORDER = TRUE ;
+ Border = TRUE ;
Pos = MAP_APPFONT ( 4, 4 ) ;
Size = MAP_APPFONT ( 152, 14 ) ;
LEFT = TRUE ;
diff --git a/main/sd/source/ui/dlg/LayerDialog.src
b/main/sd/source/ui/dlg/LayerDialog.src
index dc4ae532b9..546ea8e0b3 100644
--- a/main/sd/source/ui/dlg/LayerDialog.src
+++ b/main/sd/source/ui/dlg/LayerDialog.src
@@ -45,7 +45,7 @@ DockingWindow FLT_WIN_LAYER_DIALOG
Pos = MAP_APPFONT ( 6, 6 ) ;
Size = MAP_APPFONT ( WIDTH-2 * 6, TAB_BAR_HEIGHT ) ;
HelpId = HID_SD_TABBAR_LAYERS ;
- BORDER = TRUE ;
+ Border = TRUE ;
SvLook = TRUE ;
//Scroll = TRUE ;
//SIZEABLE = TRUE ;
diff --git a/main/sfx2/source/appl/newhelp.src
b/main/sfx2/source/appl/newhelp.src
index 7fae89aaf2..ad8a0eabb6 100644
--- a/main/sfx2/source/appl/newhelp.src
+++ b/main/sfx2/source/appl/newhelp.src
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
#include "app.hrc"
#include "newhelp.hrc"
#include "helpid.hrc"
@@ -338,14 +336,14 @@ ModalDialog DLG_HELP_ADDBOOKMARK
Text [ en-US ] = "Bookmark:" ;
TABSTOP = FALSE ;
GROUP = TRUE ;
- LEFT = TRUE ;
+ Left = TRUE ;
};
Edit ED_BOOKMARK_TITLE
{
HelpID = "sfx2:Edit:DLG_HELP_ADDBOOKMARK:ED_BOOKMARK_TITLE" ;
PosSize = MAP_APPFONT ( 6, 19, 140, 12 ) ;
TABSTOP = TRUE ;
- BORDER = TRUE ;
+ Border = TRUE ;
};
OKButton PB_BOOKMARK_OK
{
diff --git a/main/slideshow/source/engine/transitions/barndoorwipe.hxx
b/main/slideshow/source/engine/transitions/barndoorwipe.hxx
index 0c4d2d3d0f..a120414f03 100644
--- a/main/slideshow/source/engine/transitions/barndoorwipe.hxx
+++ b/main/slideshow/source/engine/transitions/barndoorwipe.hxx
@@ -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,20 +7,18 @@
* 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.
- *
+ *
*************************************************************/
-
-
#if ! defined INCLUDED_SLIDESHOW_BARNDOORWIPE_HXX
#define INCLUDED_SLIDESHOW_BARNDOORWIPE_HXX
@@ -29,23 +27,24 @@
#include "parametricpolypolygon.hxx"
#include "transitiontools.hxx"
-
namespace slideshow {
namespace internal {
-/// Generate a barn door wipe or double barn door wipe:
+// Generate a barn door wipe or double barn door wipe
class BarnDoorWipe : public ParametricPolyPolygon
{
public:
- BarnDoorWipe( bool doubled = false )
- : m_unitRect( createUnitRect() ), m_doubled(doubled) {}
- virtual ::basegfx::B2DPolyPolygon operator()( double x );
+ BarnDoorWipe( bool doubled = false )
+ : m_unitRect( createUnitRect() ), m_doubled(doubled) {}
+ virtual ::basegfx::B2DPolyPolygon operator()( double x );
private:
- const ::basegfx::B2DPolygon m_unitRect;
- const bool m_doubled;
+ const ::basegfx::B2DPolygon m_unitRect;
+ const bool m_doubled;
};
}
}
#endif /* INCLUDED_SLIDESHOW_BARNDOORWIPE_HXX */
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/slideshow/source/engine/transitions/barwipepolypolygon.hxx
b/main/slideshow/source/engine/transitions/barwipepolypolygon.hxx
index fe9ee12496..f4b7917eb2 100644
--- a/main/slideshow/source/engine/transitions/barwipepolypolygon.hxx
+++ b/main/slideshow/source/engine/transitions/barwipepolypolygon.hxx
@@ -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,45 +7,44 @@
* 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.
- *
+ *
*************************************************************/
-
-
#if ! defined INCLUDED_SLIDESHOW_BARWIPEPOLYPOLYGON_HXX
#define INCLUDED_SLIDESHOW_BARWIPEPOLYPOLYGON_HXX
#include "parametricpolypolygon.hxx"
#include "transitiontools.hxx"
-
namespace slideshow {
namespace internal {
-/// Generates a horizontal, left-to-right bar wipe:
+// Generate a horizontal, left-to-right bar wipe
class BarWipePolyPolygon : public ParametricPolyPolygon
{
public:
- BarWipePolyPolygon( sal_Int32 nBars = 1 /* nBars > 1: blinds effect */ )
- : m_nBars(nBars),
- m_unitRect( createUnitRect() )
- {}
- virtual ::basegfx::B2DPolyPolygon operator () ( double t );
+ BarWipePolyPolygon( sal_Int32 nBars = 1 /* nBars > 1: blinds effect */ )
+ : m_nBars(nBars),
+ m_unitRect( createUnitRect() )
+ {}
+ virtual ::basegfx::B2DPolyPolygon operator () ( double t );
private:
- const sal_Int32 m_nBars;
- const ::basegfx::B2DPolygon m_unitRect;
+ const sal_Int32 m_nBars;
+ const ::basegfx::B2DPolygon m_unitRect;
};
}
}
#endif /* INCLUDED_SLIDESHOW_BARWIPEPOLYPOLYGON_HXX */
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/slideshow/source/engine/transitions/checkerboardwipe.hxx
b/main/slideshow/source/engine/transitions/checkerboardwipe.hxx
index 39debbd759..2a7c4deef2 100644
--- a/main/slideshow/source/engine/transitions/checkerboardwipe.hxx
+++ b/main/slideshow/source/engine/transitions/checkerboardwipe.hxx
@@ -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,20 +7,18 @@
* 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.
- *
+ *
*************************************************************/
-
-
#if ! defined INCLUDED_SLIDESHOW_CHECKERBOARDWIPE_HXX
#define INCLUDED_SLIDESHOW_CHECKERBOARDWIPE_HXX
@@ -29,25 +27,26 @@
#include "transitiontools.hxx"
#include "parametricpolypolygon.hxx"
-
namespace slideshow {
namespace internal {
-/// Generate a check board wipe (across)
+// Generate a check board wipe (across)
class CheckerBoardWipe : public ParametricPolyPolygon
{
public:
- CheckerBoardWipe( sal_Int32 unitsPerEdge = 10 )
- : m_unitsPerEdge(unitsPerEdge),
- m_unitRect( createUnitRect() )
- { OSL_ASSERT( (unitsPerEdge % 2) == 0 ); }
- virtual ::basegfx::B2DPolyPolygon operator () ( double x );
+ CheckerBoardWipe( sal_Int32 unitsPerEdge = 10 )
+ : m_unitsPerEdge(unitsPerEdge),
+ m_unitRect( createUnitRect() )
+ { OSL_ASSERT( (unitsPerEdge % 2) == 0 ); }
+ virtual ::basegfx::B2DPolyPolygon operator () ( double x );
private:
- const sal_Int32 m_unitsPerEdge;
- const ::basegfx::B2DPolyPolygon m_unitRect;
+ const sal_Int32 m_unitsPerEdge;
+ const ::basegfx::B2DPolyPolygon m_unitRect;
};
}
}
#endif /* INCLUDED_SLIDESHOW_CHECKERBOARDWIPE_HXX */
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/slideshow/source/engine/transitions/clockwipe.hxx
b/main/slideshow/source/engine/transitions/clockwipe.hxx
index 7966cf613a..e9c0c9a4a4 100644
--- a/main/slideshow/source/engine/transitions/clockwipe.hxx
+++ b/main/slideshow/source/engine/transitions/clockwipe.hxx
@@ -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,40 +7,39 @@
* 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.
- *
+ *
*************************************************************/
-
-
#if ! defined INCLUDED_SLIDESHOW_CLOCKWIPE_HXX
#define INCLUDED_SLIDESHOW_CLOCKWIPE_HXX
#include <basegfx/polygon/b2dpolygon.hxx>
#include "parametricpolypolygon.hxx"
-
namespace slideshow {
namespace internal {
-/// Generates a clockWiseTwelve clock wipe:
+// Generate a clockWiseTwelve clock wipe
class ClockWipe : public ParametricPolyPolygon
{
public:
- /// 0,1 to 1,1 to 1,0 to 0,-1 to -1,0 to 0,1:
- static ::basegfx::B2DPolygon calcCenteredClock( double t, double e = 1.0 );
- virtual ::basegfx::B2DPolyPolygon operator () ( double t );
+ // 0,1 to 1,1 to 1,0 to 0,-1 to -1,0 to 0,1
+ static ::basegfx::B2DPolygon calcCenteredClock( double t, double e =
1.0 );
+ virtual ::basegfx::B2DPolyPolygon operator () ( double t );
};
}
}
#endif /* INCLUDED_SLIDESHOW_CLOCKWIPE_HXX */
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/slideshow/source/engine/transitions/ellipsewipe.hxx
b/main/slideshow/source/engine/transitions/ellipsewipe.hxx
index 302c1857e1..1f1d84703d 100644
--- a/main/slideshow/source/engine/transitions/ellipsewipe.hxx
+++ b/main/slideshow/source/engine/transitions/ellipsewipe.hxx
@@ -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,38 +7,37 @@
* 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.
- *
+ *
*************************************************************/
-
-
#if ! defined INCLUDED_SLIDESHOW_ELLIPSEWIPE_HXX
#define INCLUDED_SLIDESHOW_ELLIPSEWIPE_HXX
#include "parametricpolypolygon.hxx"
-
namespace slideshow {
namespace internal {
-/// Generate a iris wipe
+// Generate an ellipse wipe
class EllipseWipe : public ParametricPolyPolygon
{
public:
- EllipseWipe( sal_Int32 /*nTransitionSubType xxx todo */ ) {}
- virtual ::basegfx::B2DPolyPolygon operator () ( double x );
+ EllipseWipe( sal_Int32 /*nTransitionSubType xxx todo */ ) {}
+ virtual ::basegfx::B2DPolyPolygon operator () ( double x );
};
}
}
#endif /* INCLUDED_SLIDESHOW_ELLIPSEWIPE_HXX */
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/slideshow/source/engine/transitions/fanwipe.hxx
b/main/slideshow/source/engine/transitions/fanwipe.hxx
index 7f0e77efdb..a0e52d7e2f 100644
--- a/main/slideshow/source/engine/transitions/fanwipe.hxx
+++ b/main/slideshow/source/engine/transitions/fanwipe.hxx
@@ -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,41 +7,40 @@
* 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.
- *
+ *
*************************************************************/
-
-
#if ! defined INCLUDED_SLIDESHOW_FANWIPE_HXX
#define INCLUDED_SLIDESHOW_FANWIPE_HXX
#include "parametricpolypolygon.hxx"
-
namespace slideshow {
namespace internal {
-/// Generates a centerTop (center=true) or double fan wipe:
+// Generate a centerTop (center=true) or double fan wipe
class FanWipe : public ParametricPolyPolygon
{
public:
- FanWipe( bool center, bool single = true, bool fanIn = false )
- : m_center(center), m_single(single), m_fanIn(fanIn) {}
- virtual ::basegfx::B2DPolyPolygon operator () ( double t );
+ FanWipe( bool center, bool single = true, bool fanIn = false )
+ : m_center(center), m_single(single), m_fanIn(fanIn) {}
+ virtual ::basegfx::B2DPolyPolygon operator () ( double t );
private:
- bool m_center, m_single, m_fanIn;
+ bool m_center, m_single, m_fanIn;
};
}
}
#endif /* INCLUDED_SLIDESHOW_FANWIPE_HXX */
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/slideshow/source/engine/transitions/fourboxwipe.hxx
b/main/slideshow/source/engine/transitions/fourboxwipe.hxx
index ee82bc9654..722f1e28b4 100644
--- a/main/slideshow/source/engine/transitions/fourboxwipe.hxx
+++ b/main/slideshow/source/engine/transitions/fourboxwipe.hxx
@@ -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,20 +7,18 @@
* 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.
- *
+ *
*************************************************************/
-
-
#if ! defined INCLUDED_SLIDESHOW_FOURBOXWIPE_HXX
#define INCLUDED_SLIDESHOW_FOURBOXWIPE_HXX
@@ -28,24 +26,25 @@
#include "transitiontools.hxx"
#include "basegfx/polygon/b2dpolygon.hxx"
-
namespace slideshow {
namespace internal {
-/// Generate a 4-box wipe
+// Generate a 4-box wipe
class FourBoxWipe : public ParametricPolyPolygon
{
public:
- FourBoxWipe( bool cornersOut ) : m_cornersOut(cornersOut),
- m_unitRect( createUnitRect() )
- {}
- virtual ::basegfx::B2DPolyPolygon operator () ( double t );
+ FourBoxWipe( bool cornersOut ) : m_cornersOut(cornersOut),
+
m_unitRect( createUnitRect() )
+ {}
+ virtual ::basegfx::B2DPolyPolygon operator () ( double t );
private:
- const bool m_cornersOut;
- const ::basegfx::B2DPolygon m_unitRect;
+ const bool m_cornersOut;
+ const ::basegfx::B2DPolygon m_unitRect;
};
}
}
#endif /* INCLUDED_SLIDESHOW_FOURBOXWIPE_HXX */
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/slideshow/source/engine/transitions/iriswipe.hxx
b/main/slideshow/source/engine/transitions/iriswipe.hxx
index 69fa89009b..2af91b349b 100644
--- a/main/slideshow/source/engine/transitions/iriswipe.hxx
+++ b/main/slideshow/source/engine/transitions/iriswipe.hxx
@@ -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,20 +7,18 @@
* 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.
- *
+ *
*************************************************************/
-
-
#if ! defined INCLUDED_SLIDESHOW_IRISWIPE_HXX
#define INCLUDED_SLIDESHOW_IRISWIPE_HXX
@@ -28,21 +26,22 @@
#include "parametricpolypolygon.hxx"
#include "transitiontools.hxx"
-
namespace slideshow {
namespace internal {
-/// Generate a iris wipe
+// Generate an iris wipe
class IrisWipe : public ParametricPolyPolygon
{
public:
- IrisWipe() : m_unitRect( createUnitRect() ) {}
- virtual ::basegfx::B2DPolyPolygon operator()( double x );
+ IrisWipe() : m_unitRect( createUnitRect() ) {}
+ virtual ::basegfx::B2DPolyPolygon operator()( double x );
private:
- const ::basegfx::B2DPolyPolygon m_unitRect;
+ const ::basegfx::B2DPolyPolygon m_unitRect;
};
}
}
#endif /* INCLUDED_SLIDESHOW_IRISWIPE_HXX */
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/slideshow/source/engine/transitions/pinwheelwipe.hxx
b/main/slideshow/source/engine/transitions/pinwheelwipe.hxx
index d3538d109b..98364c4691 100644
--- a/main/slideshow/source/engine/transitions/pinwheelwipe.hxx
+++ b/main/slideshow/source/engine/transitions/pinwheelwipe.hxx
@@ -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,20 +7,18 @@
* 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.
- *
+ *
*************************************************************/
-
-
#if ! defined INCLUDED_SLIDESHOW_PINWHEELWIPE_HXX
#define INCLUDED_SLIDESHOW_PINWHEELWIPE_HXX
@@ -31,17 +29,19 @@
namespace slideshow {
namespace internal {
-/// Generates a n-blade pinWheel wipe:
+// Generate an n-blade pinwheel wipe
class PinWheelWipe : public ParametricPolyPolygon
{
public:
- PinWheelWipe( sal_Int32 blades ) : m_blades(blades) {}
- virtual ::basegfx::B2DPolyPolygon operator () ( double t );
+ PinWheelWipe( sal_Int32 blades ) : m_blades(blades) {}
+ virtual ::basegfx::B2DPolyPolygon operator () ( double t );
private:
- sal_Int32 m_blades;
+ sal_Int32 m_blades;
};
}
}
#endif /* INCLUDED_SLIDESHOW_PINWHEELWIPE_HXX */
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/slideshow/source/engine/transitions/transitiontools.hxx
b/main/slideshow/source/engine/transitions/transitiontools.hxx
index f67b85789e..6083fda004 100644
--- a/main/slideshow/source/engine/transitions/transitiontools.hxx
+++ b/main/slideshow/source/engine/transitions/transitiontools.hxx
@@ -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,20 +7,18 @@
* 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 INCLUDED_SLIDESHOW_TRANSITIONTOOLS_HXX
#define INCLUDED_SLIDESHOW_TRANSITIONTOOLS_HXX
@@ -30,22 +28,23 @@
#include <algorithm>
-
namespace slideshow {
namespace internal {
-/// Create a unit rect.
+// Create a unit rect
::basegfx::B2DPolygon createUnitRect();
-/// Flips on X-axis:
+// Flip on X-axis
::basegfx::B2DPolyPolygon flipOnXAxis(
- ::basegfx::B2DPolyPolygon const & polypoly );
+ ::basegfx::B2DPolyPolygon const & polypoly );
-/// Flips on Y-axis:
+// Flip on Y-axis
::basegfx::B2DPolyPolygon flipOnYAxis(
- ::basegfx::B2DPolyPolygon const & polypoly );
+ ::basegfx::B2DPolyPolygon const & polypoly );
}
}
#endif /* INCLUDED_SLIDESHOW_TRANSITIONTOOLS_HXX */
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/slideshow/source/engine/transitions/veewipe.hxx
b/main/slideshow/source/engine/transitions/veewipe.hxx
index dc6d385823..38e8bb1766 100644
--- a/main/slideshow/source/engine/transitions/veewipe.hxx
+++ b/main/slideshow/source/engine/transitions/veewipe.hxx
@@ -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,20 +7,18 @@
* 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.
- *
+ *
*************************************************************/
-
-
#if ! defined INCLUDED_SLIDESHOW_VEEWIPE_HXX
#define INCLUDED_SLIDESHOW_VEEWIPE_HXX
@@ -29,19 +27,20 @@
#include "parametricpolypolygon.hxx"
#include "transitiontools.hxx"
-
namespace slideshow {
namespace internal {
-/// Generate a vee wipe
+// Generate a vee wipe
class VeeWipe : public ParametricPolyPolygon
{
public:
- VeeWipe() {}
- virtual ::basegfx::B2DPolyPolygon operator()( double x );
+ VeeWipe() {}
+ virtual ::basegfx::B2DPolyPolygon operator()( double x );
};
}
}
#endif /* INCLUDED_SLIDESHOW_VEEWIPE_HXX */
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/slideshow/source/engine/transitions/zigzagwipe.hxx
b/main/slideshow/source/engine/transitions/zigzagwipe.hxx
index 951b04d62f..78531f068b 100644
--- a/main/slideshow/source/engine/transitions/zigzagwipe.hxx
+++ b/main/slideshow/source/engine/transitions/zigzagwipe.hxx
@@ -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,50 +7,49 @@
* 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.
- *
+ *
*************************************************************/
-
-
#if ! defined INCLUDED_SLIDESHOW_ZIGZAGWIPE_HXX
#define INCLUDED_SLIDESHOW_ZIGZAGWIPE_HXX
#include "parametricpolypolygon.hxx"
#include <basegfx/polygon/b2dpolygon.hxx>
-
namespace slideshow {
namespace internal {
-/// Generates a left to right zigZag wipe:
+// Generate a left to right zigZag wipe
class ZigZagWipe : public ParametricPolyPolygon
{
public:
- ZigZagWipe( sal_Int32 nZigs );
- virtual ::basegfx::B2DPolyPolygon operator () ( double t );
+ ZigZagWipe( sal_Int32 nZigs );
+ virtual ::basegfx::B2DPolyPolygon operator () ( double t );
protected:
- const double m_zigEdge;
- ::basegfx::B2DPolygon m_stdZigZag;
+ const double m_zigEdge;
+ ::basegfx::B2DPolygon m_stdZigZag;
};
-/// Generates a vertical barnZigZag wipe:
+// Generate a vertical barnZigZag wipe
class BarnZigZagWipe : public ZigZagWipe
{
public:
- BarnZigZagWipe( sal_Int32 nZigs ) : ZigZagWipe(nZigs) {}
- virtual ::basegfx::B2DPolyPolygon operator () ( double t );
+ BarnZigZagWipe( sal_Int32 nZigs ) : ZigZagWipe(nZigs) {}
+ virtual ::basegfx::B2DPolyPolygon operator () ( double t );
};
}
}
#endif /* INCLUDED_SLIDESHOW_ZIGZAGWIPE_HXX */
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sw/source/ui/app/app.src b/main/sw/source/ui/app/app.src
index 1769f7ca2b..00e8b77526 100644
--- a/main/sw/source/ui/app/app.src
+++ b/main/sw/source/ui/app/app.src
@@ -262,7 +262,7 @@ HelpText [ en-US ] = "The objectbar contains, depending on
your current "
"working context, buttons for the editing of text, "
"frames, graphics, tables or numberings." ;
OUTPUTSIZE = TRUE ;
- BORDER = TRUE ;
+ Border = TRUE ;
Size = (28, 27) ;
};
*/
diff --git a/main/sw/source/ui/config/optload.src
b/main/sw/source/ui/config/optload.src
index b20fc65ab3..7175786548 100644
--- a/main/sw/source/ui/config/optload.src
+++ b/main/sw/source/ui/config/optload.src
@@ -19,17 +19,11 @@
*
*************************************************************/
-
-
#include "globals.hrc"
#include "optload.hrc"
#include "helpid.h"
#include "config.hrc"
-/**************************************************************************/
-/* */
-/**************************************************************************/
-
TabPage TP_OPTLOAD_PAGE
{
HelpID = HID_OPTLOAD_PAGE ;
@@ -337,7 +331,7 @@ TabPage TP_OPTCAPTION_PAGE
Size = MAP_APPFONT ( 59, 12 ) ;
Border = TRUE ;
MaxTextLength = 1 ;
- TEXT = "." ;
+ Text = "." ;
};
FixedLine FL_CATEGORY
{
diff --git a/main/sw/source/ui/fldui/fldui.src
b/main/sw/source/ui/fldui/fldui.src
index 8cd8d98021..1622a10848 100644
--- a/main/sw/source/ui/fldui/fldui.src
+++ b/main/sw/source/ui/fldui/fldui.src
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
#define _FLDUI_SRC
#include "index.hrc"
#include "fldui.hrc"
@@ -36,9 +34,9 @@ String STR_FLD_EDIT_DLG
/*--------------------------------------------------------------------
Beschreibung: Strings fuer die Types
--------------------------------------------------------------------*/
-//
+
// Bereich Dokument
-//
+
String STR_DATEFLD
{
Text [ en-US ] = "Date" ;
@@ -280,7 +278,7 @@ String FMT_DDE_NORMAL
};
String FLD_INPUT_TEXT
{
- TEXT = "[Text]" ;
+ Text = "[Text]" ;
};
/*--------------------------------------------------------------------
Beschreibung: SubType Extuser
@@ -405,19 +403,19 @@ String FMT_CHAPTER_NAMENO
--------------------------------------------------------------------*/
String FMT_NUM_ABC
{
- TEXT = "A B C" ;
+ Text = "A B C" ;
};
String FMT_NUM_SABC
{
- TEXT = "a b c" ;
+ Text = "a b c" ;
};
String FMT_NUM_ABC_N
{
- TEXT = "A .. AA .. AAA" ;
+ Text = "A .. AA .. AAA" ;
};
String FMT_NUM_SABC_N
{
- TEXT = "a .. aa .. aaa" ;
+ Text = "a .. aa .. aaa" ;
};
String FMT_NUM_ROMAN
{
@@ -575,7 +573,7 @@ String FMT_MARK_OLE
--------------------------------------------------------------------*/
String FMT_TEXT
{
- TEXT = "Text" ;
+ Text = "Text" ;
};
/*--------------------------------------------------------------------
Beschreibung: globale String-Ressourcen
diff --git a/main/sw/source/ui/fldui/fldvar.src
b/main/sw/source/ui/fldui/fldvar.src
index efd9182d4c..d46adb87d4 100644
--- a/main/sw/source/ui/fldui/fldvar.src
+++ b/main/sw/source/ui/fldui/fldvar.src
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
#include "globals.hrc"
#include "fldtdlg.hrc"
#include "helpid.h"
@@ -140,7 +138,7 @@ TabPage TP_FLD_VAR
Border = TRUE ;
Hide = TRUE ;
MaxTextLength = 1 ;
- TEXT = "." ;
+ Text = "." ;
};
FixedText FT_VARNAME
{
diff --git a/main/sw/source/ui/frmdlg/cption.src
b/main/sw/source/ui/frmdlg/cption.src
index d9576e15d7..524f2a329d 100644
--- a/main/sw/source/ui/frmdlg/cption.src
+++ b/main/sw/source/ui/frmdlg/cption.src
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
// #include *****************************************************************
#include "helpid.h"
#include "frmui.hrc"
@@ -273,7 +271,7 @@ ModalDialog DLG_SEQUENCE_OPTION
Size = MAP_APPFONT ( 72, 12 ) ;
Border = TRUE ;
MaxTextLength = 1 ;
- TEXT = "." ;
+ Text = "." ;
};
FixedLine FL_CATANDFRAME
{
diff --git a/main/toolkit/source/awt/vclxwindow1.cxx
b/main/toolkit/source/awt/vclxwindow1.cxx
index 2dd2fd6e72..3c2304f796 100644
--- a/main/toolkit/source/awt/vclxwindow1.cxx
+++ b/main/toolkit/source/awt/vclxwindow1.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,20 +7,18 @@
* 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.
- *
+ *
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_toolkit.hxx"
@@ -45,51 +43,51 @@
#endif
#include <vcl/sysdata.hxx>
-/// helper method to set a window handle into a SystemParentData struct
+// helper method to set a window handle into a SystemParentData struct
void VCLXWindow::SetSystemParent_Impl( const com::sun::star::uno::Any& rHandle
)
{
// does only work for WorkWindows
Window *pWindow = GetWindow();
if ( pWindow->GetType() != WINDOW_WORKWINDOW )
{
- ::com::sun::star::uno::Exception *pException =
+ ::com::sun::star::uno::Exception *pException =
new ::com::sun::star::uno::RuntimeException;
pException->Message = ::rtl::OUString::createFromAscii( "not a
work window" );
throw pException;
}
- // use sal_Int64 here to accommodate all int types
- // uno::Any shift operator will upcast if necessary
- sal_Int64 nHandle = 0;
- sal_Bool bXEmbed = sal_False;
- bool bThrow = false;
- if( ! (rHandle >>= nHandle) )
- {
- com::sun::star::uno::Sequence< com::sun::star::beans::NamedValue >
aProps;
- if( rHandle >>= aProps )
- {
- const int nProps = aProps.getLength();
- const com::sun::star::beans::NamedValue* pProps =
aProps.getConstArray();
- for( int i = 0; i < nProps; i++ )
- {
- if( pProps[i].Name.equalsAscii( "WINDOW" ) )
- pProps[i].Value >>= nHandle;
- else if( pProps[i].Name.equalsAscii( "XEMBED" ) )
- pProps[i].Value >>= bXEmbed;
- }
- }
- else
- bThrow = true;
- }
- if( bThrow )
- {
- ::com::sun::star::uno::Exception *pException =
- new ::com::sun::star::uno::RuntimeException;
- pException->Message = ::rtl::OUString::createFromAscii( "incorrect
window handle type" );
- throw pException;
- }
- // create system parent data
- SystemParentData aSysParentData;
+ // use sal_Int64 here to accommodate all int types
+ // uno::Any shift operator will upcast if necessary
+ sal_Int64 nHandle = 0;
+ sal_Bool bXEmbed = sal_False;
+ bool bThrow = false;
+ if( ! (rHandle >>= nHandle) )
+ {
+ com::sun::star::uno::Sequence<
com::sun::star::beans::NamedValue > aProps;
+ if( rHandle >>= aProps )
+ {
+ const int nProps = aProps.getLength();
+ const com::sun::star::beans::NamedValue* pProps =
aProps.getConstArray();
+ for( int i = 0; i < nProps; i++ )
+ {
+ if( pProps[i].Name.equalsAscii( "WINDOW" ) )
+ pProps[i].Value >>= nHandle;
+ else if( pProps[i].Name.equalsAscii( "XEMBED" )
)
+ pProps[i].Value >>= bXEmbed;
+ }
+ }
+ else
+ bThrow = true;
+ }
+ if( bThrow )
+ {
+ ::com::sun::star::uno::Exception *pException =
+ new ::com::sun::star::uno::RuntimeException;
+ pException->Message = ::rtl::OUString::createFromAscii(
"incorrect window handle type" );
+ throw pException;
+ }
+ // create system parent data
+ SystemParentData aSysParentData;
aSysParentData.nSize = sizeof ( SystemParentData );
#if defined( WNT ) || defined ( OS2 )
aSysParentData.hWnd = (HWND) nHandle;
@@ -97,9 +95,11 @@ void VCLXWindow::SetSystemParent_Impl( const
com::sun::star::uno::Any& rHandle )
aSysParentData.pView = reinterpret_cast<NSView*>(nHandle);
#elif defined( UNX )
aSysParentData.aWindow = (long)nHandle;
- aSysParentData.bXEmbedSupport = bXEmbed;
+ aSysParentData.bXEmbedSupport = bXEmbed;
#endif
// set system parent
((WorkWindow*)pWindow)->SetPluginParent( &aSysParentData );
}
+
+/* vim: set noet sw=4 ts=4: */
