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 b7f017ae01 Maintenance cleanup
b7f017ae01 is described below
commit b7f017ae01b1ec4ba7042f4287bd6df3c1f58321
Author: mseidel <[email protected]>
AuthorDate: Fri Nov 3 11:55:54 2023 +0100
Maintenance cleanup
(cherry picked from commit 07662b26dffe2c9fb8fe61592c6a0f86f1b6e728)
---
main/svx/source/stbctrls/insctrl.cxx | 32 +-
main/svx/source/stbctrls/modctrl.cxx | 12 +-
main/svx/source/stbctrls/pszctrl.cxx | 157 ++++---
main/svx/source/stbctrls/selctrl.cxx | 40 +-
main/svx/source/stbctrls/xmlsecctrl.cxx | 91 ++--
main/svx/source/stbctrls/zoomctrl.cxx | 36 +-
main/svx/source/stbctrls/zoomsliderctrl.cxx | 626 ++++++++++++++--------------
7 files changed, 498 insertions(+), 496 deletions(-)
diff --git a/main/svx/source/stbctrls/insctrl.cxx
b/main/svx/source/stbctrls/insctrl.cxx
index de1cbdede9..03d3f1fffa 100644
--- a/main/svx/source/stbctrls/insctrl.cxx
+++ b/main/svx/source/stbctrls/insctrl.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.
- *
+ *
*************************************************************/
@@ -47,7 +47,7 @@ SFX_IMPL_STATUSBAR_CONTROL(SvxInsertStatusBarControl,
SfxBoolItem);
// class SvxInsertStatusBarControl ---------------------------------------
SvxInsertStatusBarControl::SvxInsertStatusBarControl( sal_uInt16 _nSlotId,
- sal_uInt16 _nId,
+
sal_uInt16 _nId,
StatusBar& rStb ) :
SfxStatusBarControl( _nSlotId, _nId, rStb ),
@@ -85,14 +85,14 @@ void SvxInsertStatusBarControl::Click()
return;
bInsert = !bInsert;
SfxBoolItem aIns( GetSlotId(), bInsert );
-
- ::com::sun::star::uno::Any a;
- ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >
aArgs( 1 );
- aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "InsertMode"
));
- aIns.QueryValue( a );
- aArgs[0].Value = a;
-
- execute( aArgs );
+
+ ::com::sun::star::uno::Any a;
+ ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue
> aArgs( 1 );
+ aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
"InsertMode" ));
+ aIns.QueryValue( a );
+ aArgs[0].Value = a;
+
+ execute( aArgs );
}
// -----------------------------------------------------------------------
@@ -115,8 +115,8 @@ void SvxInsertStatusBarControl::DrawItemText_Impl()
sal_uIntPtr SvxInsertStatusBarControl::GetDefItemWidth(const StatusBar& rStb)
{
- long nWidth1 =
rStb.GetTextWidth(SVX_RESSTR(RID_SVXSTR_OVERWRITE_TEXT));
- long nWidth2 = rStb.GetTextWidth(SVX_RESSTR(RID_SVXSTR_INSERT_TEXT));
+ long nWidth1 = rStb.GetTextWidth(SVX_RESSTR(RID_SVXSTR_OVERWRITE_TEXT));
+ long nWidth2 = rStb.GetTextWidth(SVX_RESSTR(RID_SVXSTR_INSERT_TEXT));
if(nWidth1<nWidth2)
nWidth1=nWidth2;
@@ -124,4 +124,4 @@ sal_uIntPtr
SvxInsertStatusBarControl::GetDefItemWidth(const StatusBar& rStb)
return nWidth1+PAINT_OFFSET;
}
-
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/svx/source/stbctrls/modctrl.cxx
b/main/svx/source/stbctrls/modctrl.cxx
index c7634fde57..62cec6f98d 100644
--- a/main/svx/source/stbctrls/modctrl.cxx
+++ b/main/svx/source/stbctrls/modctrl.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.
- *
+ *
*************************************************************/
@@ -44,7 +44,7 @@ SFX_IMPL_STATUSBAR_CONTROL(SvxModifyControl, SfxBoolItem);
// class SvxModifyControl ------------------------------------------------
SvxModifyControl::SvxModifyControl( sal_uInt16 _nSlotId,
- sal_uInt16 _nId,
+
sal_uInt16 _nId,
StatusBar& rStb ) :
SfxStatusBarControl( _nSlotId, _nId, rStb ),
@@ -91,4 +91,4 @@ sal_uIntPtr SvxModifyControl::GetDefItemWidth(const
StatusBar& rStb)
return rStb.GetTextWidth(String::CreateFromAscii("XX"));
}
-
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/svx/source/stbctrls/pszctrl.cxx
b/main/svx/source/stbctrls/pszctrl.cxx
index 279a070214..005fa3727b 100644
--- a/main/svx/source/stbctrls/pszctrl.cxx
+++ b/main/svx/source/stbctrls/pszctrl.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.
- *
+ *
*************************************************************/
@@ -49,7 +49,6 @@
#include <svx/dialmgr.hxx>
#include "svx/dlgutil.hxx"
#include "stbctrls.h"
-#include "sfx2/module.hxx"
#include <svx/dialogs.hrc>
#include <unotools/localedatawrapper.hxx>
@@ -75,7 +74,7 @@ String SvxPosSizeStatusBarControl::GetMetricStr_Impl( long
nVal )
{
// Applikations-Metrik besorgen und setzen
FieldUnit eOutUnit = SfxModule::GetModuleFieldUnit( getFrameInterface()
);
- FieldUnit eInUnit = FUNIT_100TH_MM;
+ FieldUnit eInUnit = FUNIT_100TH_MM;
String sMetric;
const sal_Unicode cSep =
Application::GetSettings().GetLocaleDataWrapper().getNumDecimalSep().GetChar(0);
@@ -116,7 +115,7 @@ public:
private:
sal_uInt16 nSelected;
- virtual void Select();
+ virtual void Select();
};
// -----------------------------------------------------------------------
@@ -143,24 +142,24 @@ struct SvxPosSizeStatusBarControl_Impl
/* [Beschreibung]
Diese Implementations-Struktur der Klasse SvxPosSizeStatusBarControl
- dient der Entkopplung von "Anderungen vom exportierten Interface sowie
+ dient der Entkopplung von Änderungen vom exportierten Interface sowie
der Verringerung von extern sichtbaren Symbolen.
- Eine Instanz exisitiert pro SvxPosSizeStatusBarControl-Instanz
- f"ur deren Laufzeit.
+ Eine Instanz existiert pro SvxPosSizeStatusBarControl-Instanz
+ für deren Laufzeit.
*/
{
- Point aPos; // g"ultig, wenn eine Position angezeigt wird
- Size aSize; // g"ultig, wenn eine Gr"o/se angezeigt wird
- String aStr; // g"ultig, wenn ein Text angezeigt wird
- sal_Bool bPos; // show position
- sal_Bool bSize; // Gr"o/se anzeigen?
+ Point aPos; // gültig, wenn eine Position angezeigt wird
+ Size aSize; // gültig, wenn eine Größe angezeigt wird
+ String aStr; // gültig, wenn ein Text angezeigt wird
+ sal_Bool bPos; // show position?
+ sal_Bool bSize; // show size?
sal_Bool bTable; // Tabellenindex anzeigen?
- sal_Bool bHasMenu; // StarCalc Popup-Menue anzeigen?
- sal_uInt16 nFunction; // selektierte StarCalc Funktion
- Image aPosImage; // Image f"ur die Positionsanzeige
- Image aSizeImage; // Image f"ur die Gr"o/senanzeige
+ sal_Bool bHasMenu; // Calc Popup-Menü anzeigen?
+ sal_uInt16 nFunction; // selektierte Calc Funktion
+ Image aPosImage; // Image für die Positionsanzeige
+ Image aSizeImage; // Image für die Größenanzeige
};
// class SvxPosSizeStatusBarControl ------------------------------------------
@@ -169,7 +168,7 @@ struct SvxPosSizeStatusBarControl_Impl
Ctor():
Anlegen einer Impl-Klassen-Instanz, Default die Zeitanzeige enablen,
- Images fu"r die Position und Gro"sse laden.
+ Images für die Position und Größe laden.
*/
#define STR_POSITION ".uno:Position"
@@ -177,12 +176,12 @@ struct SvxPosSizeStatusBarControl_Impl
#define STR_FUNC ".uno:StatusBarFunc"
SvxPosSizeStatusBarControl::SvxPosSizeStatusBarControl( sal_uInt16 _nSlotId,
- sal_uInt16 _nId,
+
sal_uInt16 _nId,
StatusBar& rStb ) :
SfxStatusBarControl( _nSlotId, _nId, rStb ),
pImp( new SvxPosSizeStatusBarControl_Impl )
{
- pImp->bPos = sal_False;
+ pImp->bPos = sal_False;
pImp->bSize = sal_False;
pImp->bTable = sal_False;
pImp->bHasMenu = sal_False;
@@ -190,9 +189,9 @@ SvxPosSizeStatusBarControl::SvxPosSizeStatusBarControl(
sal_uInt16 _nSlotId,
pImp->aPosImage = Image( ResId( RID_SVXBMP_POSITION, DIALOG_MGR() ) );
pImp->aSizeImage = Image( ResId( RID_SVXBMP_SIZE, DIALOG_MGR() ) );
- addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
STR_POSITION ))); // SID_ATTR_POSITION
- addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
STR_TABLECELL ))); // SID_TABLE_CELL
- addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( STR_FUNC
))); // SID_PSZ_FUNCTION
+ addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
STR_POSITION ))); // SID_ATTR_POSITION
+ addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
STR_TABLECELL ))); // SID_TABLE_CELL
+ addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( STR_FUNC
))); // SID_PSZ_FUNCTION
}
// -----------------------------------------------------------------------
@@ -200,7 +199,7 @@ SvxPosSizeStatusBarControl::SvxPosSizeStatusBarControl(
sal_uInt16 _nSlotId,
/* [Beschreibung]
Dtor():
- Pointer auf die Impl-Klasse lo"schen, damit der Timer gestoppt wird.
+ Pointer auf die Impl-Klasse löschen, damit der Timer gestoppt wird.
*/
SvxPosSizeStatusBarControl::~SvxPosSizeStatusBarControl()
@@ -212,17 +211,17 @@ SvxPosSizeStatusBarControl::~SvxPosSizeStatusBarControl()
/* [Beschreibung]
- SID_PSZ_FUNCTION aktiviert das Popup-Menue fuer Calc, ansonsten:
+ SID_PSZ_FUNCTION aktiviert das Popup-Menü für Calc, ansonsten:
Statusbenachrichtigung;
Je nach Item-Typ wird eine bestimmte Anzeige enabled, die anderen
disabled.
NULL/Void SfxPointItem SvxSizeItem
SfxStringItem
------------------------------------------------------------------------
- Zeit sal_True sal_False
sal_False FALSE
- Position sal_False
FALSE
- Gro"sse FALSE TRUE
FALSE
- Text sal_False
sal_False TRUE
+ Zeit sal_True sal_False sal_False
FALSE
+ Position sal_False
FALSE
+ Größe FALSE TRUE
FALSE
+ Text sal_False
sal_False TRUE
Ein anderes Item bewirkt einen Assert, die Zeitanzeige wird enabled.
*/
@@ -231,16 +230,16 @@ void SvxPosSizeStatusBarControl::StateChanged( sal_uInt16
nSID, SfxItemState eSt
const SfxPoolItem* pState )
{
// da Kombi-Controller, immer die aktuelle Id als HelpId setzen
- // gecachten HelpText vorher l"oschen
+ // gecachten HelpText vorher löschen
GetStatusBar().SetHelpText( GetId(), String() );
- switch ( nSID )
- {
- case SID_ATTR_POSITION : GetStatusBar().SetHelpId( GetId(),
STR_POSITION ); break;
- case SID_TABLE_CELL: GetStatusBar().SetHelpId( GetId(), STR_TABLECELL
); break;
- case SID_PSZ_FUNCTION: GetStatusBar().SetHelpId( GetId(), STR_FUNC );
break;
- default: break;
- }
+ switch ( nSID )
+ {
+ case SID_ATTR_POSITION : GetStatusBar().SetHelpId( GetId(),
STR_POSITION ); break;
+ case SID_TABLE_CELL: GetStatusBar().SetHelpId( GetId(),
STR_TABLECELL ); break;
+ case SID_PSZ_FUNCTION: GetStatusBar().SetHelpId( GetId(),
STR_FUNC ); break;
+ default: break;
+ }
if ( nSID == SID_PSZ_FUNCTION )
{
@@ -255,30 +254,30 @@ void SvxPosSizeStatusBarControl::StateChanged( sal_uInt16
nSID, SfxItemState eSt
}
else if ( SFX_ITEM_AVAILABLE != eState )
{
- // #i34458# don't switch to empty display before an empty state was
- // notified for all display types
-
- if ( nSID == SID_TABLE_CELL )
- pImp->bTable = sal_False;
- else if ( nSID == SID_ATTR_POSITION )
- pImp->bPos = sal_False;
- else if ( nSID == GetSlotId() ) // controller is registered for
SID_ATTR_SIZE
- pImp->bSize = sal_False;
- else
- {
- DBG_ERRORFILE("unknown slot id");
- }
+ // #i34458# don't switch to empty display before an empty state
was
+ // notified for all display types
+
+ if ( nSID == SID_TABLE_CELL )
+ pImp->bTable = sal_False;
+ else if ( nSID == SID_ATTR_POSITION )
+ pImp->bPos = sal_False;
+ else if ( nSID == GetSlotId() ) // controller is registered for
SID_ATTR_SIZE
+ pImp->bSize = sal_False;
+ else
+ {
+ DBG_ERRORFILE("unknown slot id");
+ }
}
else if ( pState->ISA( SfxPointItem ) )
{
// Position anzeigen
pImp->aPos = ( (SfxPointItem*)pState )->GetValue();
- pImp->bPos = sal_True;
+ pImp->bPos = sal_True;
pImp->bTable = sal_False;
}
else if ( pState->ISA( SvxSizeItem ) )
{
- // Groesse anzeigen
+ // Größe anzeigen
pImp->aSize = ( (SvxSizeItem*)pState )->GetSize();
pImp->bSize = sal_True;
pImp->bTable = sal_False;
@@ -288,14 +287,14 @@ void SvxPosSizeStatusBarControl::StateChanged( sal_uInt16
nSID, SfxItemState eSt
// String anzeigen (Tabellen-Zelle oder anderes)
pImp->aStr = ( (SfxStringItem*)pState )->GetValue();
pImp->bTable = sal_True;
- pImp->bPos = sal_False;
+ pImp->bPos = sal_False;
pImp->bSize = sal_False;
}
else
{
DBG_ERRORFILE( "invalid item type" );
// trotzdem Datum und Zeit anzeigen
- pImp->bPos = sal_False;
+ pImp->bPos = sal_False;
pImp->bSize = sal_False;
pImp->bTable = sal_False;
}
@@ -315,7 +314,7 @@ void SvxPosSizeStatusBarControl::StateChanged( sal_uInt16
nSID, SfxItemState eSt
/* [Beschreibung]
- Popup-Menue ausfuehren, wenn per Status enabled
+ Popup-Menü ausführen, wenn per Status enabled
*/
void SvxPosSizeStatusBarControl::Command( const CommandEvent& rCEvt )
@@ -334,15 +333,15 @@ void SvxPosSizeStatusBarControl::Command( const
CommandEvent& rCEvt )
if (nSelect == PSZ_FUNC_NONE)
nSelect = 0;
- ::com::sun::star::uno::Any a;
+ ::com::sun::star::uno::Any a;
SfxUInt16Item aItem( SID_PSZ_FUNCTION, nSelect
);
-
- ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue > aArgs( 1 );
- aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
"StatusBarFunc" ));
- aItem.QueryValue( a );
- aArgs[0].Value = a;
-
- execute( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
".uno:StatusBarFunc" )), aArgs );
+
+ ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue > aArgs( 1 );
+ aArgs[0].Name = rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "StatusBarFunc" ));
+ aItem.QueryValue( a );
+ aArgs[0].Value = a;
+
+ execute( rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( ".uno:StatusBarFunc" )), aArgs );
// GetBindings().GetDispatcher()->Execute(
SID_PSZ_FUNCTION, SFX_CALLMODE_RECORD, &aItem, 0L );
}
}
@@ -356,7 +355,7 @@ void SvxPosSizeStatusBarControl::Command( const
CommandEvent& rCEvt )
/* [Beschreibung]
Je nach enableden Anzeigentyp, wird der Wert angezeigt. Vorher wird
- das Rectangle u"bermalt (gelo"scht).
+ das Rectangle übermalt (gelöscht).
*/
void SvxPosSizeStatusBarControl::Paint( const UserDrawEvent& rUsrEvt )
@@ -373,7 +372,7 @@ void SvxPosSizeStatusBarControl::Paint( const
UserDrawEvent& rUsrEvt )
if ( pImp->bPos || pImp->bSize )
{
- // Position fuer Size-Anzeige berechnen
+ // Position für Size-Anzeige berechnen
long nSizePosX =
rRect.Left() + rRect.GetWidth() / 2 + PAINT_OFFSET;
// Position zeichnen
@@ -383,14 +382,14 @@ void SvxPosSizeStatusBarControl::Paint( const
UserDrawEvent& rUsrEvt )
pDev->DrawImage( aPnt, pImp->aPosImage );
aPnt.X() += pImp->aPosImage.GetSizePixel().Width();
aPnt.X() += PAINT_OFFSET;
- String aStr = GetMetricStr_Impl( pImp->aPos.X());
+ String aStr = GetMetricStr_Impl( pImp->aPos.X());
aStr.AppendAscii(" / ");
- aStr += GetMetricStr_Impl( pImp->aPos.Y());
+ aStr += GetMetricStr_Impl( pImp->aPos.Y());
pDev->DrawRect(
Rectangle( aPnt, Point( nSizePosX, rRect.Bottom() ) ) );
pDev->DrawText( aPnt, aStr );
- // falls verf"ugbar, Gr"osse zeichnen
+ // falls verfügbar, Größe zeichnen
aPnt.X() = nSizePosX;
if ( pImp->bSize )
@@ -399,9 +398,9 @@ void SvxPosSizeStatusBarControl::Paint( const
UserDrawEvent& rUsrEvt )
aPnt.X() += pImp->aSizeImage.GetSizePixel().Width();
Point aDrwPnt = aPnt;
aPnt.X() += PAINT_OFFSET;
- aStr = GetMetricStr_Impl( pImp->aSize.Width() );
+ aStr = GetMetricStr_Impl( pImp->aSize.Width() );
aStr.AppendAscii(" x ");
- aStr += GetMetricStr_Impl( pImp->aSize.Height() );
+ aStr += GetMetricStr_Impl( pImp->aSize.Height() );
pDev->DrawRect( Rectangle( aDrwPnt, rRect.BottomRight()
) );
pDev->DrawText( aPnt, aStr );
}
@@ -415,12 +414,12 @@ void SvxPosSizeStatusBarControl::Paint( const
UserDrawEvent& rUsrEvt )
rRect.Left() + rRect.GetWidth() / 2 -
pDev->GetTextWidth( pImp->aStr ) / 2,
aItemPos.Y() ), pImp->aStr );
}
- else
- {
- // Empty display if neither size nor table position are available.
- // Date/Time are no longer used (#65302#).
- pDev->DrawRect( rRect );
- }
+ else
+ {
+ // Empty display if neither size nor table position are
available.
+ // Date/Time are no longer used (#65302#).
+ pDev->DrawRect( rRect );
+ }
pDev->SetLineColor( aOldLineColor );
pDev->SetFillColor( aOldFillColor );
@@ -440,4 +439,4 @@ sal_uIntPtr
SvxPosSizeStatusBarControl::GetDefItemWidth(const StatusBar& rStb)
return nWidth;
}
-
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/svx/source/stbctrls/selctrl.cxx
b/main/svx/source/stbctrls/selctrl.cxx
index 7a611384cb..bbd27e1919 100644
--- a/main/svx/source/stbctrls/selctrl.cxx
+++ b/main/svx/source/stbctrls/selctrl.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.
- *
+ *
*************************************************************/
@@ -80,16 +80,16 @@ void SvxSelectionModeControl::Click()
if ( nState > 3 )
nState = 0;
- ::com::sun::star::uno::Any a;
- SfxUInt16Item aState( GetSlotId(), nState );
- INetURLObject aObj( m_aCommandURL );
-
- ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >
aArgs( 1 );
- aArgs[0].Name = aObj.GetURLPath();
- aState.QueryValue( a );
- aArgs[0].Value = a;
-
- execute( aArgs );
+ ::com::sun::star::uno::Any a;
+ SfxUInt16Item aState( GetSlotId(), nState );
+ INetURLObject aObj( m_aCommandURL );
+
+ ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue
> aArgs( 1 );
+ aArgs[0].Name = aObj.GetURLPath();
+ aState.QueryValue( a );
+ aArgs[0].Value = a;
+
+ execute( aArgs );
}
// -----------------------------------------------------------------------
@@ -130,10 +130,10 @@ void SvxSelectionModeControl::DrawItemText_Impl()
sal_uIntPtr SvxSelectionModeControl::GetDefItemWidth(const StatusBar& rStb)
{
- long nWidth1 = rStb.GetTextWidth(SVX_RESSTR(RID_SVXSTR_SELMODE_STD));
- long nWidth2 = rStb.GetTextWidth(SVX_RESSTR(RID_SVXSTR_SELMODE_ER));
- long nWidth3 = rStb.GetTextWidth(SVX_RESSTR(RID_SVXSTR_SELMODE_ERG));
- long nWidth4 = rStb.GetTextWidth(SVX_RESSTR(RID_SVXSTR_SELMODE_BLK));
+ long nWidth1 = rStb.GetTextWidth(SVX_RESSTR(RID_SVXSTR_SELMODE_STD));
+ long nWidth2 = rStb.GetTextWidth(SVX_RESSTR(RID_SVXSTR_SELMODE_ER));
+ long nWidth3 = rStb.GetTextWidth(SVX_RESSTR(RID_SVXSTR_SELMODE_ERG));
+ long nWidth4 = rStb.GetTextWidth(SVX_RESSTR(RID_SVXSTR_SELMODE_BLK));
if(nWidth1<nWidth2)
nWidth1=nWidth2;
@@ -141,10 +141,10 @@ sal_uIntPtr
SvxSelectionModeControl::GetDefItemWidth(const StatusBar& rStb)
if(nWidth1<nWidth3)
nWidth1=nWidth3;
- if(nWidth1<nWidth4)
+ if(nWidth1<nWidth4)
nWidth1=nWidth4;
return nWidth1+PAINT_OFFSET;
}
-
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/svx/source/stbctrls/xmlsecctrl.cxx
b/main/svx/source/stbctrls/xmlsecctrl.cxx
index c58f67c970..28596f9535 100644
--- a/main/svx/source/stbctrls/xmlsecctrl.cxx
+++ b/main/svx/source/stbctrls/xmlsecctrl.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.
- *
+ *
*************************************************************/
@@ -78,24 +78,24 @@ struct XmlSecStatusBarControl::XmlSecStatusBarControl_Impl
Size maSize;
sal_uInt16 mnState;
Image maImage;
- Image maImageBroken;
- Image maImageNotValidated;
+ Image maImageBroken;
+ Image maImageNotValidated;
};
-XmlSecStatusBarControl::XmlSecStatusBarControl( sal_uInt16 _nSlotId,
sal_uInt16 _nId, StatusBar& _rStb )
- :SfxStatusBarControl( _nSlotId, _nId, _rStb )
+XmlSecStatusBarControl::XmlSecStatusBarControl( sal_uInt16 _nSlotId,
sal_uInt16 _nId, StatusBar& _rStb )
+ :SfxStatusBarControl( _nSlotId, _nId, _rStb )
,mpImpl( new XmlSecStatusBarControl_Impl )
{
mpImpl->mnState = (sal_uInt16)SIGNATURESTATE_UNKNOWN;
- sal_Bool bHC =
GetStatusBar().GetSettings().GetStyleSettings().GetHighContrastMode();
- mpImpl->maImage = Image( SVX_RES( bHC ? RID_SVXBMP_SIGNET_H :
RID_SVXBMP_SIGNET ) );
- mpImpl->maImageBroken =
- Image( SVX_RES( bHC ? RID_SVXBMP_SIGNET_BROKEN_H :
RID_SVXBMP_SIGNET_BROKEN ) );
- mpImpl->maImageNotValidated =
- Image( SVX_RES( bHC ? RID_SVXBMP_SIGNET_NOTVALIDATED_H :
RID_SVXBMP_SIGNET_NOTVALIDATED ) );
+ sal_Bool bHC =
GetStatusBar().GetSettings().GetStyleSettings().GetHighContrastMode();
+ mpImpl->maImage = Image( SVX_RES( bHC ? RID_SVXBMP_SIGNET_H :
RID_SVXBMP_SIGNET ) );
+ mpImpl->maImageBroken =
+ Image( SVX_RES( bHC ? RID_SVXBMP_SIGNET_BROKEN_H :
RID_SVXBMP_SIGNET_BROKEN ) );
+ mpImpl->maImageNotValidated =
+ Image( SVX_RES( bHC ? RID_SVXBMP_SIGNET_NOTVALIDATED_H :
RID_SVXBMP_SIGNET_NOTVALIDATED ) );
}
XmlSecStatusBarControl::~XmlSecStatusBarControl()
@@ -120,22 +120,22 @@ void XmlSecStatusBarControl::StateChanged( sal_uInt16,
SfxItemState eState, cons
mpImpl->mnState = (sal_uInt16)SIGNATURESTATE_UNKNOWN;
}
- if( GetStatusBar().AreItemsVisible() ) //
necessary ?
+ if( GetStatusBar().AreItemsVisible() ) // necessary ?
GetStatusBar().SetItemData( GetId(), 0 );
- GetStatusBar().SetItemText( GetId(), String() ); // necessary ?
+ GetStatusBar().SetItemText( GetId(), String() ); // necessary ?
- sal_uInt16 nResId = RID_SVXSTR_XMLSEC_NO_SIG;
- if ( mpImpl->mnState == SIGNATURESTATE_SIGNATURES_OK )
- nResId = RID_SVXSTR_XMLSEC_SIG_OK;
- else if ( mpImpl->mnState == SIGNATURESTATE_SIGNATURES_BROKEN )
- nResId = RID_SVXSTR_XMLSEC_SIG_NOT_OK;
- else if ( mpImpl->mnState == SIGNATURESTATE_SIGNATURES_NOTVALIDATED )
- nResId = RID_SVXSTR_XMLSEC_SIG_OK_NO_VERIFY;
- else if ( mpImpl->mnState == SIGNATURESTATE_SIGNATURES_PARTIAL_OK )
- nResId = RID_SVXSTR_XMLSEC_SIG_CERT_OK_PARTIAL_SIG;
+ sal_uInt16 nResId = RID_SVXSTR_XMLSEC_NO_SIG;
+ if ( mpImpl->mnState == SIGNATURESTATE_SIGNATURES_OK )
+ nResId = RID_SVXSTR_XMLSEC_SIG_OK;
+ else if ( mpImpl->mnState == SIGNATURESTATE_SIGNATURES_BROKEN )
+ nResId = RID_SVXSTR_XMLSEC_SIG_NOT_OK;
+ else if ( mpImpl->mnState == SIGNATURESTATE_SIGNATURES_NOTVALIDATED )
+ nResId = RID_SVXSTR_XMLSEC_SIG_OK_NO_VERIFY;
+ else if ( mpImpl->mnState == SIGNATURESTATE_SIGNATURES_PARTIAL_OK )
+ nResId = RID_SVXSTR_XMLSEC_SIG_CERT_OK_PARTIAL_SIG;
- GetStatusBar().SetQuickHelpText( GetId(), SVX_RESSTR( nResId ) );
+ GetStatusBar().SetQuickHelpText( GetId(), SVX_RESSTR( nResId ) );
}
void XmlSecStatusBarControl::Command( const CommandEvent& rCEvt )
@@ -145,16 +145,16 @@ void XmlSecStatusBarControl::Command( const CommandEvent&
rCEvt )
PopupMenu aPopupMenu( ResId( RID_SVXMNU_XMLSECSTATBAR,
DIALOG_MGR() ) );
if( aPopupMenu.Execute( &GetStatusBar(),
rCEvt.GetMousePosPixel() ) )
{
- ::com::sun::star::uno::Any a;
- SfxUInt16Item aState( GetSlotId(), 0 );
- INetURLObject aObj( m_aCommandURL );
+ ::com::sun::star::uno::Any a;
+ SfxUInt16Item aState( GetSlotId(), 0 );
+ INetURLObject aObj( m_aCommandURL );
- ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue > aArgs( 1 );
- aArgs[0].Name = aObj.GetURLPath();
- aState.QueryValue( a );
- aArgs[0].Value = a;
+ ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue > aArgs( 1 );
+ aArgs[0].Name = aObj.GetURLPath();
+ aState.QueryValue( a );
+ aArgs[0].Value = a;
- execute( aArgs );
+ execute( aArgs );
}
}
else
@@ -179,17 +179,17 @@ void XmlSecStatusBarControl::Paint( const UserDrawEvent&
rUsrEvt )
++aRect.Top();
pDev->DrawImage( aRect.TopLeft(), mpImpl->maImage );
}
- else if( mpImpl->mnState == SIGNATURESTATE_SIGNATURES_BROKEN )
- {
- ++aRect.Top();
- pDev->DrawImage( aRect.TopLeft(), mpImpl->maImageBroken );
- }
- else if( mpImpl->mnState == SIGNATURESTATE_SIGNATURES_NOTVALIDATED
- || mpImpl->mnState == SIGNATURESTATE_SIGNATURES_PARTIAL_OK)
- {
- ++aRect.Top();
- pDev->DrawImage( aRect.TopLeft(), mpImpl->maImageNotValidated );
- }
+ else if( mpImpl->mnState == SIGNATURESTATE_SIGNATURES_BROKEN )
+ {
+ ++aRect.Top();
+ pDev->DrawImage( aRect.TopLeft(), mpImpl->maImageBroken );
+ }
+ else if( mpImpl->mnState == SIGNATURESTATE_SIGNATURES_NOTVALIDATED
+ || mpImpl->mnState == SIGNATURESTATE_SIGNATURES_PARTIAL_OK)
+ {
+ ++aRect.Top();
+ pDev->DrawImage( aRect.TopLeft(), mpImpl->maImageNotValidated );
+ }
else
pDev->DrawRect( aRect );
@@ -202,3 +202,4 @@ long XmlSecStatusBarControl::GetDefItemWidth( StatusBar& )
return 16;
}
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/svx/source/stbctrls/zoomctrl.cxx
b/main/svx/source/stbctrls/zoomctrl.cxx
index e3f3111806..935672bff1 100644
--- a/main/svx/source/stbctrls/zoomctrl.cxx
+++ b/main/svx/source/stbctrls/zoomctrl.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.
- *
+ *
*************************************************************/
@@ -108,7 +108,7 @@ void ZoomPopup_Impl::Select()
// class SvxZoomStatusBarControl ------------------------------------------
SvxZoomStatusBarControl::SvxZoomStatusBarControl( sal_uInt16 _nSlotId,
- sal_uInt16 _nId,
+
sal_uInt16 _nId,
StatusBar& rStb ) :
SfxStatusBarControl( _nSlotId, _nId, rStb ),
@@ -132,7 +132,7 @@ void SvxZoomStatusBarControl::StateChanged( sal_uInt16,
SfxItemState eState,
const SfxUInt16Item* pItem = (const SfxUInt16Item*)pState;
nZoom = pItem->GetValue();
String aStr( String::CreateFromInt32(nZoom) );
- aStr.AppendAscii( " %" );
+ aStr.AppendAscii( " %" );
GetStatusBar().SetItemText( GetId(), aStr );
if ( pState->ISA(SvxZoomItem) )
@@ -168,7 +168,7 @@ void SvxZoomStatusBarControl::StateChanged( sal_uInt16,
SfxItemState eState,
void SvxZoomStatusBarControl::Paint( const UserDrawEvent& )
{
String aStr( String::CreateFromInt32( nZoom ));
- aStr.AppendAscii( " %" );
+ aStr.AppendAscii( " %" );
GetStatusBar().SetItemText( GetId(), aStr );
}
@@ -194,15 +194,15 @@ void SvxZoomStatusBarControl::Command( const
CommandEvent& rCEvt )
case ZOOM_WHOLE_PAGE: aZoom.SetType(
SVX_ZOOM_WHOLEPAGE ); break;
}
- ::com::sun::star::uno::Any a;
- INetURLObject aObj( m_aCommandURL );
-
- ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue > aArgs( 1 );
- aArgs[0].Name = aObj.GetURLPath();
- aZoom.QueryValue( a );
- aArgs[0].Value = a;
-
- execute( aArgs );
+ ::com::sun::star::uno::Any a;
+ INetURLObject aObj( m_aCommandURL );
+
+ ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue > aArgs( 1 );
+ aArgs[0].Name = aObj.GetURLPath();
+ aZoom.QueryValue( a );
+ aArgs[0].Value = a;
+
+ execute( aArgs );
}
ReleaseMouse();
}
@@ -212,8 +212,8 @@ void SvxZoomStatusBarControl::Command( const CommandEvent&
rCEvt )
sal_uIntPtr SvxZoomStatusBarControl::GetDefItemWidth(const StatusBar& rStb)
{
- long nWidth1 = rStb.GetTextWidth(String::CreateFromAscii("XXXXX %"));
+ long nWidth1 = rStb.GetTextWidth(String::CreateFromAscii("XXXXX %"));
return nWidth1;
}
-
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/svx/source/stbctrls/zoomsliderctrl.cxx
b/main/svx/source/stbctrls/zoomsliderctrl.cxx
index e63a268560..740d9977bb 100644
--- a/main/svx/source/stbctrls/zoomsliderctrl.cxx
+++ b/main/svx/source/stbctrls/zoomsliderctrl.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.
- *
+ *
*************************************************************/
@@ -47,30 +47,30 @@ SFX_IMPL_STATUSBAR_CONTROL( SvxZoomSliderControl,
SvxZoomSliderItem );
struct SvxZoomSliderControl::SvxZoomSliderControl_Impl
{
- sal_uInt16 mnCurrentZoom;
- sal_uInt16 mnMinZoom;
- sal_uInt16 mnMaxZoom;
- sal_uInt16 mnSliderCenter;
- std::vector< long > maSnappingPointOffsets;
- std::vector< sal_uInt16 > maSnappingPointZooms;
- Image maSliderButton;
- Image maIncreaseButton;
- Image maDecreaseButton;
- bool mbValuesSet;
- bool mbOmitPaint;
-
- SvxZoomSliderControl_Impl() :
- mnCurrentZoom( 0 ),
- mnMinZoom( 0 ),
- mnMaxZoom( 0 ),
- mnSliderCenter( 0 ),
- maSnappingPointOffsets(),
- maSnappingPointZooms(),
- maSliderButton(),
- maIncreaseButton(),
- maDecreaseButton(),
- mbValuesSet( false ),
- mbOmitPaint( false ) {}
+ sal_uInt16 mnCurrentZoom;
+ sal_uInt16 mnMinZoom;
+ sal_uInt16 mnMaxZoom;
+ sal_uInt16 mnSliderCenter;
+ std::vector< long > maSnappingPointOffsets;
+ std::vector< sal_uInt16 > maSnappingPointZooms;
+ Image maSliderButton;
+ Image maIncreaseButton;
+ Image maDecreaseButton;
+ bool mbValuesSet;
+ bool mbOmitPaint;
+
+ SvxZoomSliderControl_Impl() :
+ mnCurrentZoom( 0 ),
+ mnMinZoom( 0 ),
+ mnMaxZoom( 0 ),
+ mnSliderCenter( 0 ),
+ maSnappingPointOffsets(),
+ maSnappingPointZooms(),
+ maSliderButton(),
+ maIncreaseButton(),
+ maDecreaseButton(),
+ mbValuesSet( false ),
+ mbOmitPaint( false ) {}
};
// -----------------------------------------------------------------------
@@ -87,104 +87,104 @@ const long nSnappingPointsMinDist = nSnappingEpsilon; //
minimum distance of two
// -----------------------------------------------------------------------
-// nOffset referes to the origin of the control:
+// nOffset refers to the origin of the control:
// + ----------- -
sal_uInt16 SvxZoomSliderControl::Offset2Zoom( long nOffset ) const
{
- const long nControlWidth = getControlRect().GetWidth();
- sal_uInt16 nRet = 0;
-
- if ( nOffset < nSliderXOffset )
- return mpImpl->mnMinZoom;;
-
- if ( nOffset > nControlWidth - nSliderXOffset )
- return mpImpl->mnMaxZoom;
-
- // check for snapping points:
- sal_uInt16 nCount = 0;
- std::vector< long >::iterator aSnappingPointIter;
- for ( aSnappingPointIter = mpImpl->maSnappingPointOffsets.begin();
- aSnappingPointIter != mpImpl->maSnappingPointOffsets.end();
- ++aSnappingPointIter )
- {
- const long nCurrent = *aSnappingPointIter;
- if ( Abs(nCurrent - nOffset) < nSnappingEpsilon )
- {
- nOffset = nCurrent;
- nRet = mpImpl->maSnappingPointZooms[ nCount ];
- break;
- }
- ++nCount;
- }
-
- if ( 0 == nRet )
- {
- if ( nOffset < nControlWidth / 2 )
- {
- // first half of slider
- const long nFirstHalfRange = mpImpl->mnSliderCenter -
mpImpl->mnMinZoom;
- const long nHalfSliderWidth = nControlWidth/2 - nSliderXOffset;
- const long nZoomPerSliderPixel = (1000 * nFirstHalfRange) /
nHalfSliderWidth;
- const long nOffsetToSliderLeft = nOffset - nSliderXOffset;
- nRet = mpImpl->mnMinZoom + sal_uInt16( nOffsetToSliderLeft *
nZoomPerSliderPixel / 1000 );
- }
- else
- {
- // second half of slider
- const long nSecondHalfRange = mpImpl->mnMaxZoom -
mpImpl->mnSliderCenter;
- const long nHalfSliderWidth = nControlWidth/2 - nSliderXOffset;
- const long nZoomPerSliderPixel = 1000 * nSecondHalfRange /
nHalfSliderWidth;
- const long nOffsetToSliderCenter = nOffset - nControlWidth/2;
- nRet = mpImpl->mnSliderCenter + sal_uInt16( nOffsetToSliderCenter
* nZoomPerSliderPixel / 1000 );
- }
- }
-
- if ( nRet < mpImpl->mnMinZoom )
- nRet = mpImpl->mnMinZoom;
- else if ( nRet > mpImpl->mnMaxZoom )
- nRet = mpImpl->mnMaxZoom;
-
- return nRet;
+ const long nControlWidth = getControlRect().GetWidth();
+ sal_uInt16 nRet = 0;
+
+ if ( nOffset < nSliderXOffset )
+ return mpImpl->mnMinZoom;;
+
+ if ( nOffset > nControlWidth - nSliderXOffset )
+ return mpImpl->mnMaxZoom;
+
+ // check for snapping points:
+ sal_uInt16 nCount = 0;
+ std::vector< long >::iterator aSnappingPointIter;
+ for ( aSnappingPointIter = mpImpl->maSnappingPointOffsets.begin();
+ aSnappingPointIter != mpImpl->maSnappingPointOffsets.end();
+ ++aSnappingPointIter )
+ {
+ const long nCurrent = *aSnappingPointIter;
+ if ( Abs(nCurrent - nOffset) < nSnappingEpsilon )
+ {
+ nOffset = nCurrent;
+ nRet = mpImpl->maSnappingPointZooms[ nCount ];
+ break;
+ }
+ ++nCount;
+ }
+
+ if ( 0 == nRet )
+ {
+ if ( nOffset < nControlWidth / 2 )
+ {
+ // first half of slider
+ const long nFirstHalfRange = mpImpl->mnSliderCenter -
mpImpl->mnMinZoom;
+ const long nHalfSliderWidth = nControlWidth/2 -
nSliderXOffset;
+ const long nZoomPerSliderPixel = (1000 *
nFirstHalfRange) / nHalfSliderWidth;
+ const long nOffsetToSliderLeft = nOffset -
nSliderXOffset;
+ nRet = mpImpl->mnMinZoom + sal_uInt16(
nOffsetToSliderLeft * nZoomPerSliderPixel / 1000 );
+ }
+ else
+ {
+ // second half of slider
+ const long nSecondHalfRange = mpImpl->mnMaxZoom -
mpImpl->mnSliderCenter;
+ const long nHalfSliderWidth = nControlWidth/2 -
nSliderXOffset;
+ const long nZoomPerSliderPixel = 1000 *
nSecondHalfRange / nHalfSliderWidth;
+ const long nOffsetToSliderCenter = nOffset -
nControlWidth/2;
+ nRet = mpImpl->mnSliderCenter + sal_uInt16(
nOffsetToSliderCenter * nZoomPerSliderPixel / 1000 );
+ }
+ }
+
+ if ( nRet < mpImpl->mnMinZoom )
+ nRet = mpImpl->mnMinZoom;
+ else if ( nRet > mpImpl->mnMaxZoom )
+ nRet = mpImpl->mnMaxZoom;
+
+ return nRet;
}
// returns the offset to the left control border
long SvxZoomSliderControl::Zoom2Offset( sal_uInt16 nCurrentZoom ) const
{
- const long nControlWidth = getControlRect().GetWidth();
- long nRet = nSliderXOffset;
-
- const long nHalfSliderWidth = nControlWidth/2 - nSliderXOffset;
-
- if ( nCurrentZoom <= mpImpl->mnSliderCenter )
- {
- nCurrentZoom = nCurrentZoom - mpImpl->mnMinZoom;
- const long nFirstHalfRange = mpImpl->mnSliderCenter -
mpImpl->mnMinZoom;
- const long nSliderPixelPerZoomPercent = 1000 * nHalfSliderWidth /
nFirstHalfRange;
- const long nOffset = (nSliderPixelPerZoomPercent * nCurrentZoom) /
1000;
- nRet += nOffset;
- }
- else
- {
- nCurrentZoom = nCurrentZoom - mpImpl->mnSliderCenter;
- const long nSecondHalfRange = mpImpl->mnMaxZoom -
mpImpl->mnSliderCenter;
- const long nSliderPixelPerZoomPercent = 1000 * nHalfSliderWidth /
nSecondHalfRange;
- const long nOffset = (nSliderPixelPerZoomPercent * nCurrentZoom) /
1000;
- nRet += nHalfSliderWidth + nOffset;
- }
-
- return nRet;
+ const long nControlWidth = getControlRect().GetWidth();
+ long nRet = nSliderXOffset;
+
+ const long nHalfSliderWidth = nControlWidth/2 - nSliderXOffset;
+
+ if ( nCurrentZoom <= mpImpl->mnSliderCenter )
+ {
+ nCurrentZoom = nCurrentZoom - mpImpl->mnMinZoom;
+ const long nFirstHalfRange = mpImpl->mnSliderCenter -
mpImpl->mnMinZoom;
+ const long nSliderPixelPerZoomPercent = 1000 * nHalfSliderWidth
/ nFirstHalfRange;
+ const long nOffset = (nSliderPixelPerZoomPercent *
nCurrentZoom) / 1000;
+ nRet += nOffset;
+ }
+ else
+ {
+ nCurrentZoom = nCurrentZoom - mpImpl->mnSliderCenter;
+ const long nSecondHalfRange = mpImpl->mnMaxZoom -
mpImpl->mnSliderCenter;
+ const long nSliderPixelPerZoomPercent = 1000 * nHalfSliderWidth
/ nSecondHalfRange;
+ const long nOffset = (nSliderPixelPerZoomPercent *
nCurrentZoom) / 1000;
+ nRet += nHalfSliderWidth + nOffset;
+ }
+
+ return nRet;
}
// -----------------------------------------------------------------------
SvxZoomSliderControl::SvxZoomSliderControl( sal_uInt16 _nSlotId, sal_uInt16
_nId, StatusBar& _rStb ) :
- SfxStatusBarControl( _nSlotId, _nId, _rStb ),
- mpImpl( new SvxZoomSliderControl_Impl )
+ SfxStatusBarControl( _nSlotId, _nId, _rStb ),
+ mpImpl( new SvxZoomSliderControl_Impl )
{
- const sal_Bool bHC =
GetStatusBar().GetSettings().GetStyleSettings().GetHighContrastMode();
- mpImpl->maSliderButton = Image( SVX_RES( bHC ?
RID_SVXBMP_SLIDERBUTTON_HC : RID_SVXBMP_SLIDERBUTTON ) );
- mpImpl->maIncreaseButton = Image( SVX_RES( bHC ?
RID_SVXBMP_SLIDERINCREASE_HC : RID_SVXBMP_SLIDERINCREASE ) );
- mpImpl->maDecreaseButton = Image( SVX_RES( bHC ?
RID_SVXBMP_SLIDERDECREASE_HC : RID_SVXBMP_SLIDERDECREASE ) );
+ const sal_Bool bHC =
GetStatusBar().GetSettings().GetStyleSettings().GetHighContrastMode();
+ mpImpl->maSliderButton = Image( SVX_RES( bHC ?
RID_SVXBMP_SLIDERBUTTON_HC : RID_SVXBMP_SLIDERBUTTON ) );
+ mpImpl->maIncreaseButton = Image( SVX_RES( bHC ?
RID_SVXBMP_SLIDERINCREASE_HC : RID_SVXBMP_SLIDERINCREASE ) );
+ mpImpl->maDecreaseButton = Image( SVX_RES( bHC ?
RID_SVXBMP_SLIDERDECREASE_HC : RID_SVXBMP_SLIDERDECREASE ) );
}
// -----------------------------------------------------------------------
@@ -198,247 +198,249 @@ SvxZoomSliderControl::~SvxZoomSliderControl()
void SvxZoomSliderControl::StateChanged( sal_uInt16 /*nSID*/, SfxItemState
eState, const SfxPoolItem* pState )
{
- if ( (SFX_ITEM_AVAILABLE != eState) || pState->ISA( SfxVoidItem ) )
- {
- GetStatusBar().SetItemText( GetId(), String() );
- mpImpl->mbValuesSet = false;
- }
- else
- {
- OSL_ENSURE( pState->ISA( SvxZoomSliderItem ), "invalid item type:
should be a SvxZoomSliderItem" );
- mpImpl->mnCurrentZoom = static_cast<const SvxZoomSliderItem*>( pState
)->GetValue();
- mpImpl->mnMinZoom = static_cast<const SvxZoomSliderItem*>( pState
)->GetMinZoom();
- mpImpl->mnMaxZoom = static_cast<const SvxZoomSliderItem*>( pState
)->GetMaxZoom();
- mpImpl->mnSliderCenter= 100;
- mpImpl->mbValuesSet = true;
-
- if ( mpImpl->mnSliderCenter == mpImpl->mnMaxZoom )
- mpImpl->mnSliderCenter = mpImpl->mnMinZoom +
(sal_uInt16)((mpImpl->mnMaxZoom - mpImpl->mnMinZoom) * 0.5);
-
-
- DBG_ASSERT( mpImpl->mnMinZoom <= mpImpl->mnCurrentZoom &&
- mpImpl->mnMinZoom < mpImpl->mnSliderCenter &&
- mpImpl->mnMaxZoom >= mpImpl->mnCurrentZoom &&
- mpImpl->mnMaxZoom > mpImpl->mnSliderCenter,
- "Looks like the zoom slider item is corrupted" );
-
- const com::sun::star::uno::Sequence < sal_Int32 > rSnappingPoints =
static_cast<const SvxZoomSliderItem*>( pState )->GetSnappingPoints();
- mpImpl->maSnappingPointOffsets.clear();
- mpImpl->maSnappingPointZooms.clear();
-
- // get all snapping points:
- std::set< sal_uInt16 > aTmpSnappingPoints;
- for ( sal_uInt16 j = 0; j < rSnappingPoints.getLength(); ++j )
- {
- const sal_Int32 nSnappingPoint = rSnappingPoints[j];
- aTmpSnappingPoints.insert( (sal_uInt16)nSnappingPoint );
- }
-
- // remove snapping points that are to close to each other:
- std::set< sal_uInt16 >::iterator aSnappingPointIter;
- long nLastOffset = 0;
-
- for ( aSnappingPointIter = aTmpSnappingPoints.begin();
aSnappingPointIter != aTmpSnappingPoints.end(); ++aSnappingPointIter )
- {
- const sal_uInt16 nCurrent = *aSnappingPointIter;
- const long nCurrentOffset = Zoom2Offset( nCurrent );
-
- if ( nCurrentOffset - nLastOffset >= nSnappingPointsMinDist )
- {
- mpImpl->maSnappingPointOffsets.push_back( nCurrentOffset );
- mpImpl->maSnappingPointZooms.push_back( nCurrent );
- nLastOffset = nCurrentOffset;
- }
- }
- }
-
- if ( !mpImpl->mbOmitPaint && GetStatusBar().AreItemsVisible() )
- GetStatusBar().SetItemData( GetId(), 0 ); // force repaint
+ if ( (SFX_ITEM_AVAILABLE != eState) || pState->ISA( SfxVoidItem ) )
+ {
+ GetStatusBar().SetItemText( GetId(), String() );
+ mpImpl->mbValuesSet = false;
+ }
+ else
+ {
+ OSL_ENSURE( pState->ISA( SvxZoomSliderItem ), "invalid item
type: should be a SvxZoomSliderItem" );
+ mpImpl->mnCurrentZoom = static_cast<const SvxZoomSliderItem*>(
pState )->GetValue();
+ mpImpl->mnMinZoom = static_cast<const SvxZoomSliderItem*>(
pState )->GetMinZoom();
+ mpImpl->mnMaxZoom = static_cast<const SvxZoomSliderItem*>(
pState )->GetMaxZoom();
+ mpImpl->mnSliderCenter= 100;
+ mpImpl->mbValuesSet = true;
+
+ if ( mpImpl->mnSliderCenter == mpImpl->mnMaxZoom )
+ mpImpl->mnSliderCenter = mpImpl->mnMinZoom +
(sal_uInt16)((mpImpl->mnMaxZoom - mpImpl->mnMinZoom) * 0.5);
+
+
+ DBG_ASSERT( mpImpl->mnMinZoom <= mpImpl->mnCurrentZoom &&
+ mpImpl->mnMinZoom <
mpImpl->mnSliderCenter &&
+ mpImpl->mnMaxZoom >=
mpImpl->mnCurrentZoom &&
+ mpImpl->mnMaxZoom >
mpImpl->mnSliderCenter,
+ "Looks like the zoom slider item is
corrupted" );
+
+ const com::sun::star::uno::Sequence < sal_Int32 >
rSnappingPoints = static_cast<const SvxZoomSliderItem*>( pState
)->GetSnappingPoints();
+ mpImpl->maSnappingPointOffsets.clear();
+ mpImpl->maSnappingPointZooms.clear();
+
+ // get all snapping points:
+ std::set< sal_uInt16 > aTmpSnappingPoints;
+ for ( sal_uInt16 j = 0; j < rSnappingPoints.getLength(); ++j )
+ {
+ const sal_Int32 nSnappingPoint = rSnappingPoints[j];
+ aTmpSnappingPoints.insert( (sal_uInt16)nSnappingPoint );
+ }
+
+ // remove snapping points that are to close to each other:
+ std::set< sal_uInt16 >::iterator aSnappingPointIter;
+ long nLastOffset = 0;
+
+ for ( aSnappingPointIter = aTmpSnappingPoints.begin();
aSnappingPointIter != aTmpSnappingPoints.end(); ++aSnappingPointIter )
+ {
+ const sal_uInt16 nCurrent = *aSnappingPointIter;
+ const long nCurrentOffset = Zoom2Offset( nCurrent );
+
+ if ( nCurrentOffset - nLastOffset >=
nSnappingPointsMinDist )
+ {
+ mpImpl->maSnappingPointOffsets.push_back(
nCurrentOffset );
+ mpImpl->maSnappingPointZooms.push_back(
nCurrent );
+ nLastOffset = nCurrentOffset;
+ }
+ }
+ }
+
+ if ( !mpImpl->mbOmitPaint && GetStatusBar().AreItemsVisible() )
+ GetStatusBar().SetItemData( GetId(), 0 ); // force repaint
}
// -----------------------------------------------------------------------
void SvxZoomSliderControl::Paint( const UserDrawEvent& rUsrEvt )
{
- if ( !mpImpl->mbValuesSet || mpImpl->mbOmitPaint )
- return;
-
- const Rectangle aControlRect = getControlRect();
- OutputDevice* pDev = rUsrEvt.GetDevice();
- Rectangle aRect = rUsrEvt.GetRect();
- Rectangle aSlider = aRect;
-
- aSlider.Top() += (aControlRect.GetHeight() - nSliderHeight)/2 - 1;
- aSlider.Bottom() = aSlider.Top() + nSliderHeight;
- aSlider.Left() += nSliderXOffset;
- aSlider.Right() -= nSliderXOffset;
-
- Color aOldLineColor = pDev->GetLineColor();
- Color aOldFillColor = pDev->GetFillColor();
-
- pDev->SetLineColor( Color( COL_GRAY ) );
- pDev->SetFillColor( Color( COL_GRAY ) );
-
- // draw snapping points:
- std::vector< long >::iterator aSnappingPointIter;
- for ( aSnappingPointIter = mpImpl->maSnappingPointOffsets.begin();
- aSnappingPointIter != mpImpl->maSnappingPointOffsets.end();
- ++aSnappingPointIter )
- {
- Rectangle aSnapping( aRect );
- aSnapping.Bottom() = aSlider.Top();
- aSnapping.Top() = aSnapping.Bottom() - nSnappingHeight;
- aSnapping.Left() += *aSnappingPointIter;
- aSnapping.Right() = aSnapping.Left();
- pDev->DrawRect( aSnapping );
-
- aSnapping.Top() += nSnappingHeight + nSliderHeight;
- aSnapping.Bottom() += nSnappingHeight + nSliderHeight;
- pDev->DrawRect( aSnapping );
- }
-
- // draw slider
- Rectangle aFirstLine( aSlider );
- aFirstLine.Bottom() = aFirstLine.Top();
-
- Rectangle aSecondLine( aSlider );
- aSecondLine.Top() = aSecondLine.Bottom();
-
- Rectangle aLeft( aSlider );
- aLeft.Right() = aLeft.Left();
-
- Rectangle aRight( aSlider );
- aRight.Left() = aRight.Right();
-
- pDev->SetLineColor( Color ( COL_GRAY ) );
- pDev->SetFillColor( Color ( COL_GRAY ) );
- pDev->DrawRect( aSecondLine );
- pDev->DrawRect( aRight );
-
- pDev->SetLineColor( Color( COL_GRAY ) );
- pDev->SetFillColor( Color( COL_GRAY ) );
- pDev->DrawRect( aFirstLine );
- pDev->DrawRect( aLeft );
-
- // draw slider button
- Point aImagePoint = aRect.TopLeft();
- aImagePoint.X() += Zoom2Offset( mpImpl->mnCurrentZoom );
- aImagePoint.X() -= nButtonWidth/2;
- aImagePoint.Y() += (aControlRect.GetHeight() - nButtonHeight)/2;
- pDev->DrawImage( aImagePoint, mpImpl->maSliderButton );
-
- // draw decrease button
- aImagePoint = aRect.TopLeft();
- aImagePoint.X() += (nSliderXOffset - nIncDecWidth)/2;
- aImagePoint.Y() += (aControlRect.GetHeight() - nIncDecHeight)/2;
- pDev->DrawImage( aImagePoint, mpImpl->maDecreaseButton );
-
- // draw increase button
- aImagePoint.X() = aRect.TopLeft().X() + aControlRect.GetWidth() -
nIncDecWidth - (nSliderXOffset - nIncDecWidth)/2;
- pDev->DrawImage( aImagePoint, mpImpl->maIncreaseButton );
-
- pDev->SetLineColor( aOldLineColor );
- pDev->SetFillColor( aOldFillColor );
+ if ( !mpImpl->mbValuesSet || mpImpl->mbOmitPaint )
+ return;
+
+ const Rectangle aControlRect = getControlRect();
+ OutputDevice* pDev = rUsrEvt.GetDevice();
+ Rectangle aRect = rUsrEvt.GetRect();
+ Rectangle aSlider = aRect;
+
+ aSlider.Top() += (aControlRect.GetHeight() - nSliderHeight)/2 - 1;
+ aSlider.Bottom() = aSlider.Top() + nSliderHeight;
+ aSlider.Left() += nSliderXOffset;
+ aSlider.Right() -= nSliderXOffset;
+
+ Color aOldLineColor = pDev->GetLineColor();
+ Color aOldFillColor = pDev->GetFillColor();
+
+ pDev->SetLineColor( Color( COL_GRAY ) );
+ pDev->SetFillColor( Color( COL_GRAY ) );
+
+ // draw snapping points:
+ std::vector< long >::iterator aSnappingPointIter;
+ for ( aSnappingPointIter = mpImpl->maSnappingPointOffsets.begin();
+ aSnappingPointIter != mpImpl->maSnappingPointOffsets.end();
+ ++aSnappingPointIter )
+ {
+ Rectangle aSnapping( aRect );
+ aSnapping.Bottom() = aSlider.Top();
+ aSnapping.Top() = aSnapping.Bottom() - nSnappingHeight;
+ aSnapping.Left() += *aSnappingPointIter;
+ aSnapping.Right() = aSnapping.Left();
+ pDev->DrawRect( aSnapping );
+
+ aSnapping.Top() += nSnappingHeight + nSliderHeight;
+ aSnapping.Bottom() += nSnappingHeight + nSliderHeight;
+ pDev->DrawRect( aSnapping );
+ }
+
+ // draw slider
+ Rectangle aFirstLine( aSlider );
+ aFirstLine.Bottom() = aFirstLine.Top();
+
+ Rectangle aSecondLine( aSlider );
+ aSecondLine.Top() = aSecondLine.Bottom();
+
+ Rectangle aLeft( aSlider );
+ aLeft.Right() = aLeft.Left();
+
+ Rectangle aRight( aSlider );
+ aRight.Left() = aRight.Right();
+
+ pDev->SetLineColor( Color ( COL_GRAY ) );
+ pDev->SetFillColor( Color ( COL_GRAY ) );
+ pDev->DrawRect( aSecondLine );
+ pDev->DrawRect( aRight );
+
+ pDev->SetLineColor( Color( COL_GRAY ) );
+ pDev->SetFillColor( Color( COL_GRAY ) );
+ pDev->DrawRect( aFirstLine );
+ pDev->DrawRect( aLeft );
+
+ // draw slider button
+ Point aImagePoint = aRect.TopLeft();
+ aImagePoint.X() += Zoom2Offset( mpImpl->mnCurrentZoom );
+ aImagePoint.X() -= nButtonWidth/2;
+ aImagePoint.Y() += (aControlRect.GetHeight() - nButtonHeight)/2;
+ pDev->DrawImage( aImagePoint, mpImpl->maSliderButton );
+
+ // draw decrease button
+ aImagePoint = aRect.TopLeft();
+ aImagePoint.X() += (nSliderXOffset - nIncDecWidth)/2;
+ aImagePoint.Y() += (aControlRect.GetHeight() - nIncDecHeight)/2;
+ pDev->DrawImage( aImagePoint, mpImpl->maDecreaseButton );
+
+ // draw increase button
+ aImagePoint.X() = aRect.TopLeft().X() + aControlRect.GetWidth() -
nIncDecWidth - (nSliderXOffset - nIncDecWidth)/2;
+ pDev->DrawImage( aImagePoint, mpImpl->maIncreaseButton );
+
+ pDev->SetLineColor( aOldLineColor );
+ pDev->SetFillColor( aOldFillColor );
}
// -----------------------------------------------------------------------
sal_Bool SvxZoomSliderControl::MouseButtonDown( const MouseEvent & rEvt )
{
- if ( !mpImpl->mbValuesSet )
- return sal_True;;
+ if ( !mpImpl->mbValuesSet )
+ return sal_True;;
- const Rectangle aControlRect = getControlRect();
- const Point aPoint = rEvt.GetPosPixel();
- const sal_Int32 nXDiff = aPoint.X() - aControlRect.Left();
+ const Rectangle aControlRect = getControlRect();
+ const Point aPoint = rEvt.GetPosPixel();
+ const sal_Int32 nXDiff = aPoint.X() - aControlRect.Left();
- const long nButtonLeftOffset = (nSliderXOffset - nIncDecWidth)/2;
- const long nButtonRightOffset = (nSliderXOffset + nIncDecWidth)/2;
+ const long nButtonLeftOffset = (nSliderXOffset - nIncDecWidth)/2;
+ const long nButtonRightOffset = (nSliderXOffset + nIncDecWidth)/2;
- const long nOldZoom = mpImpl->mnCurrentZoom;
+ const long nOldZoom = mpImpl->mnCurrentZoom;
- // click to - button
- if ( nXDiff >= nButtonLeftOffset && nXDiff <= nButtonRightOffset )
- mpImpl->mnCurrentZoom = mpImpl->mnCurrentZoom - 5;
- // click to + button
- else if ( nXDiff >= aControlRect.GetWidth() - nSliderXOffset +
nButtonLeftOffset &&
- nXDiff <= aControlRect.GetWidth() - nSliderXOffset +
nButtonRightOffset )
- mpImpl->mnCurrentZoom = mpImpl->mnCurrentZoom + 5;
- // click to slider
- else if( nXDiff >= nSliderXOffset && nXDiff <= aControlRect.GetWidth() -
nSliderXOffset )
- mpImpl->mnCurrentZoom = Offset2Zoom( nXDiff );
+ // click to - button
+ if ( nXDiff >= nButtonLeftOffset && nXDiff <= nButtonRightOffset )
+ mpImpl->mnCurrentZoom = mpImpl->mnCurrentZoom - 5;
+ // click to + button
+ else if ( nXDiff >= aControlRect.GetWidth() - nSliderXOffset +
nButtonLeftOffset &&
+ nXDiff <= aControlRect.GetWidth() - nSliderXOffset +
nButtonRightOffset )
+ mpImpl->mnCurrentZoom = mpImpl->mnCurrentZoom + 5;
+ // click to slider
+ else if( nXDiff >= nSliderXOffset && nXDiff <= aControlRect.GetWidth()
- nSliderXOffset )
+ mpImpl->mnCurrentZoom = Offset2Zoom( nXDiff );
- if ( mpImpl->mnCurrentZoom < mpImpl->mnMinZoom )
- mpImpl->mnCurrentZoom = mpImpl->mnMinZoom;
- else if ( mpImpl->mnCurrentZoom > mpImpl->mnMaxZoom )
- mpImpl->mnCurrentZoom = mpImpl->mnMaxZoom;
+ if ( mpImpl->mnCurrentZoom < mpImpl->mnMinZoom )
+ mpImpl->mnCurrentZoom = mpImpl->mnMinZoom;
+ else if ( mpImpl->mnCurrentZoom > mpImpl->mnMaxZoom )
+ mpImpl->mnCurrentZoom = mpImpl->mnMaxZoom;
- if ( nOldZoom == mpImpl->mnCurrentZoom )
- return sal_True;
+ if ( nOldZoom == mpImpl->mnCurrentZoom )
+ return sal_True;
- if ( GetStatusBar().AreItemsVisible() )
- GetStatusBar().SetItemData( GetId(), 0 ); // force repaint
+ if ( GetStatusBar().AreItemsVisible() )
+ GetStatusBar().SetItemData( GetId(), 0 ); // force repaint
- mpImpl->mbOmitPaint = true; // optimization: paint before executing
command,
- // then omit painting which is triggered by
the execute function
+ mpImpl->mbOmitPaint = true; // optimization: paint before executing
command,
+ // then omit
painting which is triggered by the execute function
- SvxZoomSliderItem aZoomSliderItem( mpImpl->mnCurrentZoom );
+ SvxZoomSliderItem aZoomSliderItem( mpImpl->mnCurrentZoom );
- ::com::sun::star::uno::Any a;
- aZoomSliderItem.QueryValue( a );
+ ::com::sun::star::uno::Any a;
+ aZoomSliderItem.QueryValue( a );
- ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >
aArgs( 1 );
- aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ZoomSlider"
));
- aArgs[0].Value = a;
+ ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue
> aArgs( 1 );
+ aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
"ZoomSlider" ));
+ aArgs[0].Value = a;
- execute( aArgs );
+ execute( aArgs );
- mpImpl->mbOmitPaint = false;
+ mpImpl->mbOmitPaint = false;
- return sal_True;
+ return sal_True;
}
// -----------------------------------------------------------------------
sal_Bool SvxZoomSliderControl::MouseMove( const MouseEvent & rEvt )
{
- if ( !mpImpl->mbValuesSet )
- return sal_True;;
+ if ( !mpImpl->mbValuesSet )
+ return sal_True;;
- const short nButtons = rEvt.GetButtons();
+ const short nButtons = rEvt.GetButtons();
- // check mouse move with button pressed
- if ( 1 == nButtons )
- {
- const Rectangle aControlRect = getControlRect();
- const Point aPoint = rEvt.GetPosPixel();
- const sal_Int32 nXDiff = aPoint.X() - aControlRect.Left();
+ // check mouse move with button pressed
+ if ( 1 == nButtons )
+ {
+ const Rectangle aControlRect = getControlRect();
+ const Point aPoint = rEvt.GetPosPixel();
+ const sal_Int32 nXDiff = aPoint.X() - aControlRect.Left();
- if ( nXDiff >= nSliderXOffset && nXDiff <= aControlRect.GetWidth() -
nSliderXOffset )
- {
- mpImpl->mnCurrentZoom = Offset2Zoom( nXDiff );
+ if ( nXDiff >= nSliderXOffset && nXDiff <=
aControlRect.GetWidth() - nSliderXOffset )
+ {
+ mpImpl->mnCurrentZoom = Offset2Zoom( nXDiff );
- if ( GetStatusBar().AreItemsVisible() )
- GetStatusBar().SetItemData( GetId(), 0 ); // force repaint
+ if ( GetStatusBar().AreItemsVisible() )
+ GetStatusBar().SetItemData( GetId(), 0 ); //
force repaint
- mpImpl->mbOmitPaint = true; // optimization: paint before
executing command,
- // then omit painting which is
triggered by the execute function
+ mpImpl->mbOmitPaint = true; // optimization: paint
before executing command,
+
// then omit painting which is triggered by the execute function
- // commit state change
- SvxZoomSliderItem aZoomSliderItem( mpImpl->mnCurrentZoom );
+ // commit state change
+ SvxZoomSliderItem aZoomSliderItem(
mpImpl->mnCurrentZoom );
- ::com::sun::star::uno::Any a;
- aZoomSliderItem.QueryValue( a );
+ ::com::sun::star::uno::Any a;
+ aZoomSliderItem.QueryValue( a );
- ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue > aArgs( 1 );
- aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
"ZoomSlider" ));
- aArgs[0].Value = a;
+ ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue > aArgs( 1 );
+ aArgs[0].Name = rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "ZoomSlider" ));
+ aArgs[0].Value = a;
- execute( aArgs );
+ execute( aArgs );
- mpImpl->mbOmitPaint = false;
- }
- }
+ mpImpl->mbOmitPaint = false;
+ }
+ }
- return sal_True;
+ return sal_True;
}
+
+/* vim: set noet sw=4 ts=4: */
