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 d1e7c34dd0 Maintenance cleanup
d1e7c34dd0 is described below
commit d1e7c34dd0dc8e81abd235db9af6da28d6b71165
Author: mseidel <[email protected]>
AuthorDate: Sat Oct 28 17:35:56 2023 +0200
Maintenance cleanup
(cherry picked from commit 8e9b0a85b2dd8f856db2f1d954db9a1a7b527cb1)
---
main/sc/source/ui/sidebar/CellBorderStylePopup.cxx | 18 ++-
main/sc/source/ui/sidebar/CellBorderUpdater.cxx | 84 +++++-----
main/sc/source/ui/sidebar/CellLineStylePopup.cxx | 30 ++--
.../sc/source/ui/sidebar/CellLineStyleValueSet.cxx | 74 ++++-----
.../ui/sidebar/NumberFormatPropertyPanel.src | 120 +++++++-------
main/sc/source/ui/sidebar/ScPanelFactory.cxx | 176 +++++++++++----------
6 files changed, 257 insertions(+), 245 deletions(-)
diff --git a/main/sc/source/ui/sidebar/CellBorderStylePopup.cxx
b/main/sc/source/ui/sidebar/CellBorderStylePopup.cxx
index 2a26775a8b..f67147a972 100644
--- a/main/sc/source/ui/sidebar/CellBorderStylePopup.cxx
+++ b/main/sc/source/ui/sidebar/CellBorderStylePopup.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,18 +7,20 @@
* 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.
- *
+ *
*************************************************************/
+
+
#include "precompiled_sc.hxx"
#include "CellBorderStylePopup.hxx"
@@ -27,9 +29,9 @@
namespace sc { namespace sidebar {
CellBorderStylePopup::CellBorderStylePopup (
- Window* pParent,
- const
::boost::function<svx::sidebar::PopupControl*(svx::sidebar::PopupContainer*)>&
rControlCreator)
-: Popup(pParent, rControlCreator,
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CellBorderStyle")))
+ Window* pParent,
+ const
::boost::function<svx::sidebar::PopupControl*(svx::sidebar::PopupContainer*)>&
rControlCreator)
+: Popup(pParent, rControlCreator,
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CellBorderStyle")))
{
}
@@ -39,4 +41,4 @@ CellBorderStylePopup::~CellBorderStylePopup (void)
} } // end of namespace sc::sidebar
-// eof
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sc/source/ui/sidebar/CellBorderUpdater.cxx
b/main/sc/source/ui/sidebar/CellBorderUpdater.cxx
index c658163db2..f3b3c42fb1 100644
--- a/main/sc/source/ui/sidebar/CellBorderUpdater.cxx
+++ b/main/sc/source/ui/sidebar/CellBorderUpdater.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,18 +7,20 @@
* 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.
- *
+ *
*************************************************************/
+
+
#include "precompiled_sc.hxx"
#include <CellBorderUpdater.hxx>
@@ -28,10 +30,10 @@
namespace sc { namespace sidebar {
CellBorderUpdater::CellBorderUpdater(
- sal_uInt16 nTbxBtnId,
- ToolBox& rTbx)
-: mnBtnId(nTbxBtnId),
- mrTbx(rTbx)
+ sal_uInt16 nTbxBtnId,
+ ToolBox& rTbx)
+: mnBtnId(nTbxBtnId),
+ mrTbx(rTbx)
{
}
@@ -41,29 +43,29 @@ CellBorderUpdater::~CellBorderUpdater()
void CellBorderUpdater::UpdateCellBorder(bool bTop, bool bBot, bool bLeft,
bool bRight, Image aImg, bool bVer, bool bHor)
{
- BitmapEx aBmpEx( aImg.GetBitmapEx() );
- Bitmap aBmp( aBmpEx.GetBitmap() );
- BitmapWriteAccess* pBmpAcc = aBmp.AcquireWriteAccess();
- const Size maBmpSize = aBmp.GetSizePixel();
-
- if( pBmpAcc )
- {
- Bitmap aMsk;
- BitmapWriteAccess* pMskAcc;
-
- if( aBmpEx.IsAlpha() )
- pMskAcc = ( aMsk = aBmpEx.GetAlpha().GetBitmap()
).AcquireWriteAccess();
- else if( aBmpEx.IsTransparent() )
- pMskAcc = ( aMsk = aBmpEx.GetMask() ).AcquireWriteAccess();
- else
- pMskAcc = NULL;
+ BitmapEx aBmpEx( aImg.GetBitmapEx() );
+ Bitmap aBmp( aBmpEx.GetBitmap() );
+ BitmapWriteAccess* pBmpAcc = aBmp.AcquireWriteAccess();
+ const Size maBmpSize = aBmp.GetSizePixel();
+
+ if( pBmpAcc )
+ {
+ Bitmap aMsk;
+ BitmapWriteAccess* pMskAcc;
+
+ if( aBmpEx.IsAlpha() )
+ pMskAcc = ( aMsk = aBmpEx.GetAlpha().GetBitmap()
).AcquireWriteAccess();
+ else if( aBmpEx.IsTransparent() )
+ pMskAcc = ( aMsk = aBmpEx.GetMask()
).AcquireWriteAccess();
+ else
+ pMskAcc = NULL;
pBmpAcc->SetLineColor(
::Application::GetSettings().GetStyleSettings().GetFieldTextColor() ) ;
pBmpAcc->SetFillColor( COL_BLACK);
- if(maBmpSize.Width() == 43 && maBmpSize.Height() == 43)
+ if(maBmpSize.Width() == 43 && maBmpSize.Height() == 43)
{
- Point aTL(2, 1), aTR(42,1), aBL(2, 41), aBR(42, 41),
aHL(2,21), aHR(42, 21), aVT(22,1), aVB(22, 41);
+ Point aTL(2, 1), aTR(42,1), aBL(2, 41), aBR(42, 41),
aHL(2,21), aHR(42, 21), aVT(22,1), aVB(22, 41);
if( pMskAcc )
{
pMskAcc->SetLineColor( COL_BLACK );
@@ -74,13 +76,13 @@ void CellBorderUpdater::UpdateCellBorder(bool bTop, bool
bBot, bool bLeft, bool
pBmpAcc->DrawLine( aTL,aBL );
if( pMskAcc )
pMskAcc->DrawLine( aTL,aBL );
- }
+ }
if(bRight)
{
pBmpAcc->DrawLine( aTR,aBR );
if( pMskAcc )
pMskAcc->DrawLine( aTR,aBR );
- }
+ }
if(bTop)
{
pBmpAcc->DrawLine( aTL,aTR );
@@ -98,30 +100,30 @@ void CellBorderUpdater::UpdateCellBorder(bool bTop, bool
bBot, bool bLeft, bool
pBmpAcc->DrawLine( aVT,aVB );
if( pMskAcc )
pMskAcc->DrawLine( aVT,aVB );
- }
+ }
if(bHor)
{
pBmpAcc->DrawLine( aHL,aHR );
if( pMskAcc )
pMskAcc->DrawLine( aHL,aHR );
}
- }
-
+ }
+
aBmp.ReleaseAccess( pBmpAcc );
if( pMskAcc )
- aMsk.ReleaseAccess( pMskAcc );
+ aMsk.ReleaseAccess( pMskAcc );
- if( aBmpEx.IsAlpha() )
- aBmpEx = BitmapEx( aBmp, AlphaMask( aMsk ) );
- else if( aBmpEx.IsTransparent() )
- aBmpEx = BitmapEx( aBmp, aMsk );
- else
- aBmpEx = aBmp;
+ if( aBmpEx.IsAlpha() )
+ aBmpEx = BitmapEx( aBmp, AlphaMask( aMsk ) );
+ else if( aBmpEx.IsTransparent() )
+ aBmpEx = BitmapEx( aBmp, aMsk );
+ else
+ aBmpEx = aBmp;
- mrTbx.SetItemImage( mnBtnId, Image( aBmpEx ) );
- }
+ mrTbx.SetItemImage( mnBtnId, Image( aBmpEx ) );
+ }
}
} } // end of namespace svx::sidebar
-// eof
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sc/source/ui/sidebar/CellLineStylePopup.cxx
b/main/sc/source/ui/sidebar/CellLineStylePopup.cxx
index e2694c081d..52ac2aec94 100644
--- a/main/sc/source/ui/sidebar/CellLineStylePopup.cxx
+++ b/main/sc/source/ui/sidebar/CellLineStylePopup.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,18 +7,20 @@
* 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.
- *
+ *
*************************************************************/
+
+
#include "precompiled_sc.hxx"
#include "CellLineStylePopup.hxx"
@@ -27,9 +29,9 @@
namespace sc { namespace sidebar {
CellLineStylePopup::CellLineStylePopup (
- Window* pParent,
- const
::boost::function<svx::sidebar::PopupControl*(svx::sidebar::PopupContainer*)>&
rControlCreator)
-: Popup(pParent, rControlCreator,
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CellLineStyle")))
+ Window* pParent,
+ const
::boost::function<svx::sidebar::PopupControl*(svx::sidebar::PopupContainer*)>&
rControlCreator)
+: Popup(pParent, rControlCreator,
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CellLineStyle")))
{
}
@@ -39,16 +41,16 @@ CellLineStylePopup::~CellLineStylePopup (void)
void CellLineStylePopup::SetLineStyleSelect(sal_uInt16 out, sal_uInt16 in,
sal_uInt16 dis)
{
- ProvideContainerAndControl();
+ ProvideContainerAndControl();
- CellLineStyleControl* pControl = dynamic_cast< CellLineStyleControl*
>(mpControl.get());
+ CellLineStyleControl* pControl = dynamic_cast< CellLineStyleControl*
>(mpControl.get());
- if(pControl)
- {
- pControl->SetLineStyleSelect(out, in, dis);
- }
+ if(pControl)
+ {
+ pControl->SetLineStyleSelect(out, in, dis);
+ }
}
} } // end of namespace sc::sidebar
-// eof
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sc/source/ui/sidebar/CellLineStyleValueSet.cxx
b/main/sc/source/ui/sidebar/CellLineStyleValueSet.cxx
index 87fb256b8e..d5296ac5d1 100644
--- a/main/sc/source/ui/sidebar/CellLineStyleValueSet.cxx
+++ b/main/sc/source/ui/sidebar/CellLineStyleValueSet.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,18 +7,20 @@
* 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.
- *
+ *
*************************************************************/
+
+
#include "precompiled_sc.hxx"
#include <CellLineStyleValueSet.hxx>
@@ -27,18 +29,18 @@
namespace sc { namespace sidebar {
CellLineStyleValueSet::CellLineStyleValueSet( Window* pParent, const ResId&
rResId)
-: ValueSet( pParent, rResId ),
- pVDev(NULL),
- nSelItem(0),
- bCusEnable(false)
+: ValueSet( pParent, rResId ),
+ pVDev(NULL),
+ nSelItem(0),
+ bCusEnable(false)
{
strUnit = new XubString[9];
SetColCount( 1 );
- SetLineCount( 9);
+ SetLineCount( 9);
}
CellLineStyleValueSet::~CellLineStyleValueSet()
-{
+{
delete pVDev;
delete[] strUnit;
}
@@ -61,7 +63,7 @@ void CellLineStyleValueSet::SetSelItem(sal_uInt16 nSel)
}
else
{
- SelectItem(nSelItem);
+ SelectItem(nSelItem);
GrabFocus();
}
}
@@ -84,28 +86,28 @@ void CellLineStyleValueSet::SetCusEnable(bool bEnable)
void CellLineStyleValueSet::UserDraw( const UserDrawEvent& rUDEvt )
{
Rectangle aRect = rUDEvt.GetRect();
- OutputDevice* pDev = rUDEvt.GetDevice();
+ OutputDevice* pDev = rUDEvt.GetDevice();
sal_uInt16 nItemId = rUDEvt.GetItemId();
-
+
long nRectHeight = aRect.GetHeight();
- long nRectWidth = aRect.GetWidth();
- Point aBLPos = aRect.TopLeft();
+ long nRectWidth = aRect.GetWidth();
+ Point aBLPos = aRect.TopLeft();
Font aOldFont = pDev->GetFont();
Color aOldColor = pDev->GetLineColor();
- Color aOldFillColor = pDev->GetFillColor();
+ Color aOldFillColor = pDev->GetFillColor();
Font aFont(OutputDevice::GetDefaultFont(DEFAULTFONT_UI_SANS,
MsLangId::getSystemLanguage(), DEFAULTFONT_FLAGS_ONLYONE));
- Size aSize = aFont.GetSize();
- aSize.Height() = nRectHeight*3/5;
+ Size aSize = aFont.GetSize();
+ aSize.Height() = nRectHeight * 3 / 5;
aFont.SetSize( aSize );
- Point aLineStart(aBLPos.X() + 5, aBLPos.Y() + (
nRectHeight - nItemId )/2);
- Point aLineEnd(aBLPos.X() + nRectWidth * 7 / 9 - 15, aBLPos.Y() + (
nRectHeight - nItemId )/2);
- long nTLX = aBLPos.X() + 5, nTLY = aBLPos.Y() + ( nRectHeight -
nItemId )/2;
- long nTRX = aBLPos.X() + nRectWidth * 7 / 9 - 15, nTRY = aBLPos.Y() +
( nRectHeight - nItemId )/2;
+ Point aLineStart(aBLPos.X() + 5, aBLPos.Y() + ( nRectHeight - nItemId )
/ 2);
+ Point aLineEnd(aBLPos.X() + nRectWidth * 7 / 9 - 15, aBLPos.Y() + (
nRectHeight - nItemId ) / 2);
+ long nTLX = aBLPos.X() + 5, nTLY = aBLPos.Y() + ( nRectHeight - nItemId
)/2;
+ long nTRX = aBLPos.X() + nRectWidth * 7 / 9 - 15, nTRY = aBLPos.Y() + (
nRectHeight - nItemId ) / 2;
- if( nSelItem == nItemId )
+ if( nSelItem == nItemId )
{
Color aBackColor(50,107,197);
Rectangle aBackRect = aRect;
@@ -120,29 +122,29 @@ void CellLineStyleValueSet::UserDraw( const
UserDrawEvent& rUDEvt )
pDev->DrawRect(aRect);
}
- //draw text
- if(nSelItem == nItemId )
+ // draw text
+ if(nSelItem == nItemId )
aFont.SetColor(COL_WHITE);
else
-
aFont.SetColor(GetSettings().GetStyleSettings().GetFieldTextColor()); //high
contrast
+
aFont.SetColor(GetSettings().GetStyleSettings().GetFieldTextColor()); // high
contrast
- pDev->SetFont(aFont);
- Point aStart(aBLPos.X() + nRectWidth * 7 / 9 - 5 , aBLPos.Y() +
nRectHeight/6);
- pDev->DrawText(aStart, strUnit[ nItemId - 1 ]); //can't set
TEXT_DRAW_ENDELLIPSIS here, or the text will disapear
+ pDev->SetFont(aFont);
+ Point aStart(aBLPos.X() + nRectWidth * 7 / 9 - 5 , aBLPos.Y() +
nRectHeight / 6);
+ pDev->DrawText(aStart, strUnit[ nItemId - 1 ]); // can't set
TEXT_DRAW_ENDELLIPSIS here, or the text will disappear
- //draw line
- if( nSelItem == nItemId )
+ // draw line
+ if( nSelItem == nItemId )
{
pDev->SetFillColor(COL_WHITE);
pDev->SetLineColor(COL_WHITE);
}
else
{
-
pDev->SetFillColor(GetSettings().GetStyleSettings().GetFieldTextColor());
//high contrast
-
pDev->SetLineColor(GetSettings().GetStyleSettings().GetFieldTextColor());
//high contrast
+
pDev->SetFillColor(GetSettings().GetStyleSettings().GetFieldTextColor()); //
high contrast
+
pDev->SetLineColor(GetSettings().GetStyleSettings().GetFieldTextColor()); //
high contrast
}
- switch( nItemId )
+ switch( nItemId )
{
case 1:
case 2:
@@ -176,9 +178,9 @@ void CellLineStyleValueSet::UserDraw( const UserDrawEvent&
rUDEvt )
pDev->SetLineColor(aOldColor);
pDev->SetFillColor(aOldFillColor);
pDev->SetFont(aOldFont);
-
+
}
} } // end of namespace svx::sidebar
-// eof
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sc/source/ui/sidebar/NumberFormatPropertyPanel.src
b/main/sc/source/ui/sidebar/NumberFormatPropertyPanel.src
index 2a049a4252..1456c226ef 100644
--- a/main/sc/source/ui/sidebar/NumberFormatPropertyPanel.src
+++ b/main/sc/source/ui/sidebar/NumberFormatPropertyPanel.src
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,18 +7,20 @@
* 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.
- *
+ *
*************************************************************/
+
+
#include "NumberFormatPropertyPanel.hrc"
#include <sfx2/sidebar/ResourceDefinitions.hrc>
#include "sc.hrc"
@@ -26,97 +28,97 @@
Control RID_PROPERTYPANEL_SC_NUMBERFORMAT
{
- OutputSize = TRUE;
- DialogControl = TRUE;
- Border = FALSE;
+ OutputSize = TRUE ;
+ DialogControl = TRUE ;
+ Border = FALSE ;
+
+ Size = MAP_APPFONT ( PROPERTYPAGE_WIDTH, PROPERTYPAGE_HEIGHT ) ;
+ HelpID = HID_PROPERTYPANEL_SC_NUM_SECTION ;
+ Text = "Number Format" ;
- Size = MAP_APPFONT( PROPERTYPAGE_WIDTH, PROPERTYPAGE_HEIGHT );
- HelpID = HID_PROPERTYPANEL_SC_NUM_SECTION ;
- Text = "Number Format";
-
FixedText FT_CATEGORY
{
- Pos = MAP_APPFONT ( FT_CATEGORY_X , FT_CATEGORY_Y ) ;
- Size = MAP_APPFONT ( MBOX_WIDTH*4 , TEXT_HEIGHT ) ;
+ Pos = MAP_APPFONT ( FT_CATEGORY_X, FT_CATEGORY_Y ) ;
+ Size = MAP_APPFONT ( MBOX_WIDTH * 4, TEXT_HEIGHT ) ;
Text [ en-US ] = "~Category:" ;
};
ListBox LB_CATEGORY
{
Border = TRUE ;
- Pos = MAP_APPFONT ( LB_CATEGORY_X , LB_CATEGORY_Y ) ;
- Size = MAP_APPFONT ( MBOX_WIDTH *2 , MBOX_HEIGHT ) ;
- HelpID = HID_PROPERTY_PANEL_NUMFMT_LB_CATEGORY;
- QuickHelpText [ en-US ] = "Select a category of contents.";
- TabStop = TRUE ;
+ Pos = MAP_APPFONT ( LB_CATEGORY_X, LB_CATEGORY_Y ) ;
+ Size = MAP_APPFONT ( MBOX_WIDTH * 2, MBOX_HEIGHT ) ;
+ HelpID = HID_PROPERTY_PANEL_NUMFMT_LB_CATEGORY ;
+ QuickHelpText [ en-US ] = "Select a category of contents." ;
+ TabStop = TRUE ;
DropDown = TRUE ;
StringList [ en-US ] =
{
- < "General" ; Default ; > ;
- < "Number" ;> ;
- < "Percent" ;> ;
- < "Currency" ;> ;
- < "Date" ;> ;
- < "Time" ;> ;
- < "Scientific" ;> ;
- < "Fraction" ;> ;
- < "Boolean Value" ;> ;
- < "Text" ;> ;
+ < "General" ; Default ; > ;
+ < "Number" ; > ;
+ < "Percent" ; > ;
+ < "Currency" ; > ;
+ < "Date" ; > ;
+ < "Time" ; > ;
+ < "Scientific" ; > ;
+ < "Fraction" ; > ;
+ < "Boolean Value" ; > ;
+ < "Text" ; > ;
};
};
ToolBox TBX_CATEGORY
{
- Pos = MAP_APPFONT ( TBX_CATEGORY_X , TBX_CATEGORY_Y );
+ Pos = MAP_APPFONT ( TBX_CATEGORY_X, TBX_CATEGORY_Y ) ;
SVLook = TRUE ;
Border = FALSE ;
- HelpID = HID_PROPERTY_PANEL_NUMFMT_TBX_CATEGORY;
- Text = "Format";
+ HelpID = HID_PROPERTY_PANEL_NUMFMT_TBX_CATEGORY ;
+ Text = "Format" ;
ItemList =
{
ToolBoxItem
{
Identifier = ID_NUMBER ;
- Text [ en-US ] = "Number" ;
- HelpID = HID_PROPERTY_PANEL_NUMFMT_ID_NUMBER;
+ Text [ en-US ] = "Number" ;
+ HelpID = HID_PROPERTY_PANEL_NUMFMT_ID_NUMBER;
};
ToolBoxItem
{
Identifier = ID_PERCENT ;
- Text [ en-US ] = "Percent" ;
- HelpID = HID_PROPERTY_PANEL_NUMFMT_ID_PERCENT;
+ Text [ en-US ] = "Percent" ;
+ HelpID = HID_PROPERTY_PANEL_NUMFMT_ID_PERCENT ;
};
ToolBoxItem
{
Identifier = ID_CURRENCY ;
Text [ en-US ] = "Currency" ;
- HelpID = HID_PROPERTY_PANEL_NUMFMT_ID_CURRENCY;
+ HelpID = HID_PROPERTY_PANEL_NUMFMT_ID_CURRENCY ;
};
ToolBoxItem
{
Identifier = ID_DATE ;
Text [ en-US ] = "Date" ;
- HelpID = HID_PROPERTY_PANEL_NUMFMT_ID_DATE;
+ HelpID = HID_PROPERTY_PANEL_NUMFMT_ID_DATE ;
};
ToolBoxItem
{
Identifier = ID_TEXT ;
Text [ en-US ] = "Text" ;
- HelpID = HID_PROPERTY_PANEL_NUMFMT_ID_TEXT;
+ HelpID = HID_PROPERTY_PANEL_NUMFMT_ID_TEXT ;
};
};
};
FixedText FT_DECIMALS
{
- Pos = MAP_APPFONT ( FT_DECIMALS_X , FT_DECIMALS_Y ) ;
- Size = MAP_APPFONT ( MBOX_WIDTH *2, TEXT_HEIGHT ) ;
+ Pos = MAP_APPFONT ( FT_DECIMALS_X, FT_DECIMALS_Y ) ;
+ Size = MAP_APPFONT ( MBOX_WIDTH * 2, TEXT_HEIGHT ) ;
Text [ en-US ] = "~Decimal places:" ;
};
NumericField ED_DECIMALS
{
Border = TRUE ;
- Pos = MAP_APPFONT ( LB_DECIMALS_X , LB_DECIMALS_Y ) ;
- Size = MAP_APPFONT ( MBOX_WIDTH , MBOX_HEIGHT ) ;
- HelpID = HID_PROPERTY_PANEL_NUMFMT_ED_DECIMALS;
- QuickHelpText [ en-US ] = "Enter the number of decimal places
that you want to display.";
+ Pos = MAP_APPFONT ( LB_DECIMALS_X, LB_DECIMALS_Y ) ;
+ Size = MAP_APPFONT ( MBOX_WIDTH, MBOX_HEIGHT ) ;
+ HelpID = HID_PROPERTY_PANEL_NUMFMT_ED_DECIMALS ;
+ QuickHelpText [ en-US ] = "Enter the number of decimal places
that you want to display." ;
Spin = TRUE ;
Maximum = 20 ;
Last = 15 ;
@@ -127,17 +129,17 @@ Control RID_PROPERTYPANEL_SC_NUMBERFORMAT
};
FixedText FT_LEADZEROES
{
- Pos = MAP_APPFONT ( FT_LEADZEROES_X , FT_LEADZEROES_Y ) ;
- Size = MAP_APPFONT (PROPERTYPAGE_WIDTH - MBOX_WIDTH *2 -
SECTIONPAGE_MARGIN_HORIZONTAL * 2, TEXT_HEIGHT ) ; //
+ Pos = MAP_APPFONT ( FT_LEADZEROES_X, FT_LEADZEROES_Y ) ;
+ Size = MAP_APPFONT (PROPERTYPAGE_WIDTH - MBOX_WIDTH * 2 -
SECTIONPAGE_MARGIN_HORIZONTAL * 2, TEXT_HEIGHT ) ;
Text [ en-US ] = "Leading ~zeroes:" ;
};
NumericField ED_LEADZEROES
{
Border = TRUE ;
- Pos = MAP_APPFONT ( LB_LEADZEROES_X , LB_LEADZEROES_Y ) ;
- Size = MAP_APPFONT ( MBOX_WIDTH , MBOX_HEIGHT ) ;
- HelpID = HID_PROPERTY_PANEL_NUMFMT_ED_LEADZEROES;
- QuickHelpText [ en-US ] = "Enter the maximum number of zeroes
to display before the decimal point.";
+ Pos = MAP_APPFONT ( LB_LEADZEROES_X, LB_LEADZEROES_Y ) ;
+ Size = MAP_APPFONT ( MBOX_WIDTH, MBOX_HEIGHT ) ;
+ HelpID = HID_PROPERTY_PANEL_NUMFMT_ED_LEADZEROES ;
+ QuickHelpText [ en-US ] = "Enter the maximum number of zeroes
to display before the decimal point." ;
Spin = TRUE ;
Maximum = 20 ;
Last = 15 ;
@@ -148,20 +150,20 @@ Control RID_PROPERTYPANEL_SC_NUMBERFORMAT
};
CheckBox BTN_NEGRED
{
- Pos = MAP_APPFONT ( BTN_NEGRED_X , BTN_NEGRED_Y ) ;
- Size = MAP_APPFONT ( 100 , CHECKBOX_HEIGHT ) ;
- HelpID = HID_PROPERTY_PANEL_NUMFMT_BTN_NEGRED;
- QuickHelpText [ en-US ] = "Changes the font color of negative
numbers to red.";
+ Pos = MAP_APPFONT ( BTN_NEGRED_X, BTN_NEGRED_Y ) ;
+ Size = MAP_APPFONT ( 100, CHECKBOX_HEIGHT ) ;
+ HelpID = HID_PROPERTY_PANEL_NUMFMT_BTN_NEGRED ;
+ QuickHelpText [ en-US ] = "Changes the font color of negative
numbers to red." ;
Text [ en-US ] = "~Negative numbers red" ;
};
CheckBox BTN_THOUSAND
{
- Pos = MAP_APPFONT ( BTN_THOUSAND_X , BTN_THOUSAND_Y ) ;
- Size = MAP_APPFONT ( 100 , CHECKBOX_HEIGHT ) ;
- HelpID = HID_PROPERTY_PANEL_NUMFMT_BTN_THOUSAND;
- QuickHelpText [ en-US ] = "Inserts a separator between
thousands.";
+ Pos = MAP_APPFONT ( BTN_THOUSAND_X, BTN_THOUSAND_Y ) ;
+ Size = MAP_APPFONT ( 100, CHECKBOX_HEIGHT ) ;
+ HelpID = HID_PROPERTY_PANEL_NUMFMT_BTN_THOUSAND ;
+ QuickHelpText [ en-US ] = "Inserts a separator between
thousands." ;
Text [ en-US ] = "~Thousands separator" ;
};
};
-// eof
+// ********************************************************************** EOF
diff --git a/main/sc/source/ui/sidebar/ScPanelFactory.cxx
b/main/sc/source/ui/sidebar/ScPanelFactory.cxx
index dc946da212..44394cb409 100644
--- a/main/sc/source/ui/sidebar/ScPanelFactory.cxx
+++ b/main/sc/source/ui/sidebar/ScPanelFactory.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,18 +7,20 @@
* 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.
- *
+ *
*************************************************************/
+
+
#include "precompiled_sc.hxx"
#include "ScPanelFactory.hxx"
@@ -54,30 +56,30 @@ namespace sc { namespace sidebar {
::rtl::OUString SAL_CALL ScPanelFactory::getImplementationName (void)
{
- return A2S(IMPLEMENTATION_NAME);
+ return A2S(IMPLEMENTATION_NAME);
}
cssu::Reference<cssu::XInterface> SAL_CALL ScPanelFactory::createInstance(
- const uno::Reference<lang::XMultiServiceFactory>& )
+ const uno::Reference<lang::XMultiServiceFactory>& )
{
- ::rtl::Reference<ScPanelFactory> pPanelFactory (new ScPanelFactory());
- cssu::Reference<cssu::XInterface> xService
(static_cast<XWeak*>(pPanelFactory.get()), cssu::UNO_QUERY);
- return xService;
+ ::rtl::Reference<ScPanelFactory> pPanelFactory (new ScPanelFactory());
+ cssu::Reference<cssu::XInterface> xService
(static_cast<XWeak*>(pPanelFactory.get()), cssu::UNO_QUERY);
+ return xService;
}
cssu::Sequence<OUString> SAL_CALL ScPanelFactory::getSupportedServiceNames
(void)
{
- cssu::Sequence<OUString> aServiceNames (1);
- aServiceNames[0] = A2S(SERVICE_NAME);
- return aServiceNames;
+ cssu::Sequence<OUString> aServiceNames (1);
+ aServiceNames[0] = A2S(SERVICE_NAME);
+ return aServiceNames;
}
ScPanelFactory::ScPanelFactory (void)
- : PanelFactoryInterfaceBase(m_aMutex)
+ : PanelFactoryInterfaceBase(m_aMutex)
{
}
@@ -88,86 +90,86 @@ ScPanelFactory::~ScPanelFactory (void)
Reference<ui::XUIElement> SAL_CALL ScPanelFactory::createUIElement (
- const ::rtl::OUString& rsResourceURL,
- const ::cssu::Sequence<css::beans::PropertyValue>& rArguments)
- throw(
- container::NoSuchElementException,
- lang::IllegalArgumentException,
- RuntimeException)
+ const ::rtl::OUString& rsResourceURL,
+ const ::cssu::Sequence<css::beans::PropertyValue>& rArguments)
+ throw(
+ container::NoSuchElementException,
+ lang::IllegalArgumentException,
+ RuntimeException)
{
- Reference<ui::XUIElement> xElement;
-
- const ::comphelper::NamedValueCollection aArguments (rArguments);
- Reference<frame::XFrame> xFrame (aArguments.getOrDefault("Frame",
Reference<frame::XFrame>()));
- Reference<awt::XWindow> xParentWindow
(aArguments.getOrDefault("ParentWindow", Reference<awt::XWindow>()));
- const sal_uInt64 nBindingsValue (aArguments.getOrDefault("SfxBindings",
sal_uInt64(0)));
- SfxBindings* pBindings = reinterpret_cast<SfxBindings*>(nBindingsValue);
-
- ::Window* pParentWindow = VCLUnoHelper::GetWindow(xParentWindow);
- if ( ! xParentWindow.is() || pParentWindow==NULL)
- throw RuntimeException(
- A2S("PanelFactory::createUIElement called without ParentWindow"),
- NULL);
- if ( ! xFrame.is())
- throw RuntimeException(
- A2S("PanelFactory::createUIElement called without Frame"),
- NULL);
- if (pBindings == NULL)
- throw RuntimeException(
- A2S("PanelFactory::createUIElement called without SfxBindings"),
- NULL);
+ Reference<ui::XUIElement> xElement;
+
+ const ::comphelper::NamedValueCollection aArguments (rArguments);
+ Reference<frame::XFrame> xFrame (aArguments.getOrDefault("Frame",
Reference<frame::XFrame>()));
+ Reference<awt::XWindow> xParentWindow
(aArguments.getOrDefault("ParentWindow", Reference<awt::XWindow>()));
+ const sal_uInt64 nBindingsValue (aArguments.getOrDefault("SfxBindings",
sal_uInt64(0)));
+ SfxBindings* pBindings = reinterpret_cast<SfxBindings*>(nBindingsValue);
+
+ ::Window* pParentWindow = VCLUnoHelper::GetWindow(xParentWindow);
+ if ( ! xParentWindow.is() || pParentWindow==NULL)
+ throw RuntimeException(
+ A2S("PanelFactory::createUIElement called without
ParentWindow"),
+ NULL);
+ if ( ! xFrame.is())
+ throw RuntimeException(
+ A2S("PanelFactory::createUIElement called without
Frame"),
+ NULL);
+ if (pBindings == NULL)
+ throw RuntimeException(
+ A2S("PanelFactory::createUIElement called without
SfxBindings"),
+ NULL);
#define DoesResourceEndWith(s) rsResourceURL.endsWithAsciiL(s,strlen(s))
- if (DoesResourceEndWith("/AlignmentPropertyPanel"))
- {
- AlignmentPropertyPanel* pPanel = AlignmentPropertyPanel::Create(
pParentWindow, xFrame, pBindings );
- xElement = sfx2::sidebar::SidebarPanelBase::Create(
- rsResourceURL,
- xFrame,
- pPanel,
- ui::LayoutSize(-1,-1,-1));
- }
- else if (DoesResourceEndWith("/CellAppearancePropertyPanel"))
- {
- CellAppearancePropertyPanel* pPanel =
CellAppearancePropertyPanel::Create( pParentWindow, xFrame, pBindings );
- xElement = sfx2::sidebar::SidebarPanelBase::Create(
- rsResourceURL,
- xFrame,
- pPanel,
- ui::LayoutSize(-1,-1,-1));
- }
- else if (DoesResourceEndWith("/NumberFormatPropertyPanel"))
- {
- NumberFormatPropertyPanel* pPanel = NumberFormatPropertyPanel::Create(
pParentWindow, xFrame, pBindings );
- xElement = sfx2::sidebar::SidebarPanelBase::Create(
- rsResourceURL,
- xFrame,
- pPanel,
- ui::LayoutSize(-1,-1,-1));
- }
- else if (DoesResourceEndWith("/NavigatorPanel"))
- {
- Window* pPanel = new ScNavigatorDlg(pBindings, NULL, pParentWindow,
false);
- xElement = sfx2::sidebar::SidebarPanelBase::Create(
- rsResourceURL,
- xFrame,
- pPanel,
- ui::LayoutSize(0,-1,-1));
- }
- else if (DoesResourceEndWith("/FunctionsPanel"))
- {
- Window* pPanel = new ScFunctionDockWin(pBindings, NULL, pParentWindow,
ScResId(FID_FUNCTION_BOX));
- xElement = sfx2::sidebar::SidebarPanelBase::Create(
- rsResourceURL,
- xFrame,
- pPanel,
- ui::LayoutSize(0,-1,-1));
- }
+ if (DoesResourceEndWith("/AlignmentPropertyPanel"))
+ {
+ AlignmentPropertyPanel* pPanel =
AlignmentPropertyPanel::Create( pParentWindow, xFrame, pBindings );
+ xElement = sfx2::sidebar::SidebarPanelBase::Create(
+ rsResourceURL,
+ xFrame,
+ pPanel,
+ ui::LayoutSize(-1,-1,-1));
+ }
+ else if (DoesResourceEndWith("/CellAppearancePropertyPanel"))
+ {
+ CellAppearancePropertyPanel* pPanel =
CellAppearancePropertyPanel::Create( pParentWindow, xFrame, pBindings );
+ xElement = sfx2::sidebar::SidebarPanelBase::Create(
+ rsResourceURL,
+ xFrame,
+ pPanel,
+ ui::LayoutSize(-1,-1,-1));
+ }
+ else if (DoesResourceEndWith("/NumberFormatPropertyPanel"))
+ {
+ NumberFormatPropertyPanel* pPanel =
NumberFormatPropertyPanel::Create( pParentWindow, xFrame, pBindings );
+ xElement = sfx2::sidebar::SidebarPanelBase::Create(
+ rsResourceURL,
+ xFrame,
+ pPanel,
+ ui::LayoutSize(-1,-1,-1));
+ }
+ else if (DoesResourceEndWith("/NavigatorPanel"))
+ {
+ Window* pPanel = new ScNavigatorDlg(pBindings, NULL,
pParentWindow, false);
+ xElement = sfx2::sidebar::SidebarPanelBase::Create(
+ rsResourceURL,
+ xFrame,
+ pPanel,
+ ui::LayoutSize(0,-1,-1));
+ }
+ else if (DoesResourceEndWith("/FunctionsPanel"))
+ {
+ Window* pPanel = new ScFunctionDockWin(pBindings, NULL,
pParentWindow, ScResId(FID_FUNCTION_BOX));
+ xElement = sfx2::sidebar::SidebarPanelBase::Create(
+ rsResourceURL,
+ xFrame,
+ pPanel,
+ ui::LayoutSize(0,-1,-1));
+ }
#undef DoesResourceEndWith
- return xElement;
+ return xElement;
}
} } // end of namespace sc::sidebar
-// eof
+/* vim: set noet sw=4 ts=4: */
