ooo-build r14928 - in trunk: . patches/dev300
- From: kyoshida svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r14928 - in trunk: . patches/dev300
- Date: Thu, 25 Dec 2008 06:50:11 +0000 (UTC)
Author: kyoshida
Date: Thu Dec 25 06:50:11 2008
New Revision: 14928
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14928&view=rev
Log:
2008-12-25 Kohei Yoshida <kyoshida novell com>
* patches/dev300/sc-toggle-merge-center-m37.diff:
* patches/dev300/sc-toggle-merge-center.diff:
* patches/dev300/sc-xls-builtin-name-scope-m37.diff:
* patches/dev300/sc-xls-builtin-name-scope.diff:
* patches/dev300/zoom-combobox-m37.diff:
* patches/dev300/zoom-combobox.diff:
* patches/dev300/apply: more dev300-m38 work.
Added:
trunk/patches/dev300/sc-toggle-merge-center-m37.diff
- copied unchanged from r14927, /trunk/patches/dev300/sc-toggle-merge-center.diff
trunk/patches/dev300/sc-xls-builtin-name-scope-m37.diff
- copied unchanged from r14927, /trunk/patches/dev300/sc-xls-builtin-name-scope.diff
trunk/patches/dev300/zoom-combobox-m37.diff
- copied unchanged from r14927, /trunk/patches/dev300/zoom-combobox.diff
Modified:
trunk/ChangeLog
trunk/patches/dev300/apply
trunk/patches/dev300/sc-toggle-merge-center.diff
trunk/patches/dev300/sc-xls-builtin-name-scope.diff
trunk/patches/dev300/zoom-combobox.diff
Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply (original)
+++ trunk/patches/dev300/apply Thu Dec 25 06:50:11 2008
@@ -689,6 +689,13 @@
csv-import-preserve-options-sc.diff, i#3687, i#97416, n#433378, muthusub/kohei
csv-import-preserve-options-officecfg.diff, i#3687, i#97416, n#433378, muthusub/kohei
+[ CalcFixes < dev300-m38 ]
+# Replace usability numb Zoom dialog with a Combo Box
+# FIXME: this conflicts with Sun's duplication of this work,
+# eg. print preview
+zoom-combobox-m37.diff, michael
+
+[ CalcFixes ]
# Replace usability numb Zoom dialog with a Combo Box
# FIXME: this conflicts with Sun's duplication of this work,
# eg. print preview
@@ -696,8 +703,12 @@
# make some symbols from sc visible when compiling with gcc4, necessary since m121
gcc4-visibility-sc.diff, i#53261, pmladek
+
+[ CalcFixes < dev300-m38 ]
# Fix for b.x.c 62193
sc-sheet-double-click-rename.diff, i#4517, kohei
+
+[ CalcFixes ]
# adds to Autofilter Empty-NonEmpty options bxc #62165
sc-autofilter-empty-nonempty.diff, i#35578, jody
# Improves the standard filter options and menu. bxc #62187 #62495
@@ -745,15 +756,27 @@
# Fix an error in presence of string literals in COUNTA.
sc-string-arg-counta-fix.diff, n#446622, kohei
+[ CalcFixes < dev300-m38 ]
+# Print_Area/Print_Titles are only relevant for sheet local names, n#191005
+sc-xls-builtin-name-scope-m37.diff, n#191005, n#257422, jonp
+
+[ CalcFixes >= dev300-m38 ]
# Print_Area/Print_Titles are only relevant for sheet local names, n#191005
sc-xls-builtin-name-scope.diff, n#191005, n#257422, jonp
+[ CalcFixes ]
# Allow Cols/Rows to be resized even if document is read-only, n#165980, jody
sc-read-only-colrow-resize.diff, jody
+[ CalcFixes < dev300-m38 ]
+# Implement 'Toggle merge & center'
+sc-toggle-merge-center-m37.diff, i#67243, jholesov
+
+[ CalcFixes >= dev300-m38 ]
# Implement 'Toggle merge & center'
sc-toggle-merge-center.diff, i#67243, jholesov
+[ CalcFixes ]
# Add a 'Natural' variant of sorting, blocking on ODF extension issues
sc-natural-sort.diff, i#26565, kohei
Modified: trunk/patches/dev300/sc-toggle-merge-center.diff
==============================================================================
--- trunk/patches/dev300/sc-toggle-merge-center.diff (original)
+++ trunk/patches/dev300/sc-toggle-merge-center.diff Thu Dec 25 06:50:11 2008
@@ -1,8 +1,21 @@
+diff --git officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+index e3addb9..334fbae 100644
+--- officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
++++ officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+@@ -1042,7 +1042,7 @@
+ </node>
+ <node oor:name=".uno:ToggleMergeCells" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+- <value xml:lang="en-US">M~erge Cells</value>
++ <value xml:lang="en-US">M~erge and Center Cells</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
diff --git sc/source/ui/docshell/docfunc.cxx sc/source/ui/docshell/docfunc.cxx
-index 5a8f68c..34720ec 100644
+index 6da1a09..37d799c 100644
--- sc/source/ui/docshell/docfunc.cxx
+++ sc/source/ui/docshell/docfunc.cxx
-@@ -3436,7 +3436,7 @@ BOOL ScDocFunc::FillAuto( ScRange& rRange, const ScMarkData* pTabMark, FillDir e
+@@ -3620,7 +3620,7 @@ BOOL ScDocFunc::FillAuto( ScRange& rRange, const ScMarkData* pTabMark,
//------------------------------------------------------------------------
@@ -11,7 +24,7 @@
{
ScDocShellModificator aModificator( rDocShell );
-@@ -3480,7 +3480,7 @@ BOOL ScDocFunc::MergeCells( const ScRange& rRange, BOOL bContents, BOOL bRecord,
+@@ -3664,7 +3664,7 @@ BOOL ScDocFunc::MergeCells( const ScRange& rRange, BOOL bContents, BOOL bRecord,
if (bRecord)
{
ScDocument* pUndoDoc = NULL;
@@ -20,7 +33,7 @@
{
pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
pUndoDoc->InitUndo( pDoc, nTab, nTab );
-@@ -3490,17 +3490,23 @@ BOOL ScDocFunc::MergeCells( const ScRange& rRange, BOOL bContents, BOOL bRecord,
+@@ -3674,17 +3674,23 @@ BOOL ScDocFunc::MergeCells( const ScRange& rRange, BOOL bContents, BOOL bRecord,
rDocShell.GetUndoManager()->AddUndoAction(
new ScUndoMerge( &rDocShell,
nStartCol, nStartRow, nTab,
@@ -47,10 +60,10 @@
aModificator.SetDocumentModified();
diff --git sc/source/ui/inc/docfunc.hxx sc/source/ui/inc/docfunc.hxx
-index b2b7a57..be2a7e5 100644
+index 9242e18..6d32644 100644
--- sc/source/ui/inc/docfunc.hxx
+++ sc/source/ui/inc/docfunc.hxx
-@@ -169,7 +169,7 @@ public:
+@@ -160,7 +160,7 @@ public:
BOOL ResizeMatrix( const ScRange& rOldRange, const ScAddress& rNewEnd, BOOL bApi );
BOOL MergeCells( const ScRange& rRange, BOOL bContents,
@@ -60,10 +73,10 @@
BOOL SetNote( const ScAddress& rPos, const ScPostIt& rNote, BOOL bApi );
diff --git sc/source/ui/inc/undoblk.hxx sc/source/ui/inc/undoblk.hxx
-index 42b4097..06c1feb 100644
+index c052e3e..b48a051 100644
--- sc/source/ui/inc/undoblk.hxx
+++ sc/source/ui/inc/undoblk.hxx
-@@ -464,7 +464,8 @@ public:
+@@ -450,7 +450,8 @@ public:
ScUndoMerge( ScDocShell* pNewDocShell,
SCCOL nStartX, SCROW nStartY, SCTAB nStartZ,
SCCOL nEndX, SCROW nEndY, SCTAB nEndZ,
@@ -73,7 +86,7 @@
virtual ~ScUndoMerge();
virtual void Undo();
-@@ -478,6 +479,7 @@ private:
+@@ -464,6 +465,7 @@ private:
ScRange aRange;
BOOL bDoMerge; // Merge oder aufheben
ScDocument* pUndoDoc; // wenn Daten zusammengefasst
@@ -82,10 +95,10 @@
void DoChange( const BOOL bUndo ) const;
};
diff --git sc/source/ui/inc/viewfunc.hxx sc/source/ui/inc/viewfunc.hxx
-index 43288de..71ed0d0 100644
+index 0c1fa9e..8542b69 100644
--- sc/source/ui/inc/viewfunc.hxx
+++ sc/source/ui/inc/viewfunc.hxx
-@@ -249,7 +249,7 @@ public:
+@@ -237,7 +237,7 @@ public:
BOOL TestMergeCells();
BOOL TestRemoveMerge();
@@ -95,10 +108,10 @@
void FillSimple( FillDir eDir, BOOL bRecord = TRUE );
diff --git sc/source/ui/undo/undoblk3.cxx sc/source/ui/undo/undoblk3.cxx
-index d0a5c5e..8e35362 100644
+index 3592e59..e2d5ade 100644
--- sc/source/ui/undo/undoblk3.cxx
+++ sc/source/ui/undo/undoblk3.cxx
-@@ -39,6 +39,7 @@
+@@ -34,6 +34,7 @@
// INCLUDE -------------------------------------------------------------------
#include "scitems.hxx"
@@ -106,7 +119,7 @@
#include <svx/boxitem.hxx>
#include <svx/srchitem.hxx>
#include <svx/linkmgr.hxx>
-@@ -812,13 +813,15 @@ BOOL __EXPORT ScUndoAutoFill::CanRepeat(SfxRepeatTarget& rTarget) const
+@@ -755,13 +756,15 @@ BOOL __EXPORT ScUndoAutoFill::CanRepeat(SfxRepeatTarget& rTarget) const
ScUndoMerge::ScUndoMerge( ScDocShell* pNewDocShell,
SCCOL nStartX, SCROW nStartY, SCTAB nStartZ,
SCCOL nEndX, SCROW nEndY, SCTAB nEndZ,
@@ -124,32 +137,32 @@
{
}
-@@ -865,9 +868,20 @@ void ScUndoMerge::DoChange( const BOOL bUndo ) const
+@@ -809,9 +812,20 @@ void ScUndoMerge::DoChange( const BOOL bUndo ) const
pUndoDoc->CopyToDocument( aRange, IDF_ALL, FALSE, pDoc );
}
else
-+ {
++ {
/*!*/ pDoc->DoMergeContents( aRange.aStart.Tab(),
aRange.aStart.Col(), aRange.aStart.Row(),
aRange.aEnd.Col(), aRange.aEnd.Row() );
-+ if (bCenter)
-+ {
-+ pDoc->ApplyAttr( aRange.aStart.Col(), aRange.aStart.Row(),
-+ aRange.aStart.Tab(),
-+ SvxHorJustifyItem( SVX_HOR_JUSTIFY_CENTER, ATTR_HOR_JUSTIFY ) );
-+ pDoc->ApplyAttr( aRange.aStart.Col(), aRange.aStart.Row(),
-+ aRange.aStart.Tab(),
-+ SvxVerJustifyItem( SVX_VER_JUSTIFY_CENTER, ATTR_VER_JUSTIFY ) );
-+ }
-+ }
++ if (bCenter)
++ {
++ pDoc->ApplyAttr( aRange.aStart.Col(), aRange.aStart.Row(),
++ aRange.aStart.Tab(),
++ SvxHorJustifyItem( SVX_HOR_JUSTIFY_CENTER, ATTR_HOR_JUSTIFY ) );
++ pDoc->ApplyAttr( aRange.aStart.Col(), aRange.aStart.Row(),
++ aRange.aStart.Tab(),
++ SvxVerJustifyItem( SVX_VER_JUSTIFY_CENTER, ATTR_VER_JUSTIFY ) );
++ }
++ }
+ }
BOOL bDidPaint = FALSE;
- ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
diff --git sc/source/ui/unoobj/cellsuno.cxx sc/source/ui/unoobj/cellsuno.cxx
-index 930cf19..e825ea9 100644
+index f46b82c..fbd1af0 100644
--- sc/source/ui/unoobj/cellsuno.cxx
+++ sc/source/ui/unoobj/cellsuno.cxx
-@@ -5360,7 +5360,7 @@ void SAL_CALL ScCellRangeObj::merge( sal_Bool bMerge ) throw(uno::RuntimeExcepti
+@@ -5387,7 +5387,7 @@ void SAL_CALL ScCellRangeObj::merge( sal_Bool bMerge ) throw(uno::RuntimeExcepti
{
ScDocFunc aFunc(*pDocSh);
if ( bMerge )
@@ -159,10 +172,10 @@
aFunc.UnmergeCells( aRange, TRUE, TRUE );
diff --git sc/source/ui/view/cellsh3.cxx sc/source/ui/view/cellsh3.cxx
-index d0431c6..7cc1eb4 100644
+index ee33a54..7510026 100644
--- sc/source/ui/view/cellsh3.cxx
+++ sc/source/ui/view/cellsh3.cxx
-@@ -758,6 +758,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
+@@ -764,6 +764,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
{
// test whether to merge or to split
bool bMerge = false;
@@ -170,7 +183,7 @@
switch( nSlot )
{
case FID_MERGE_ON:
-@@ -768,6 +769,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
+@@ -774,6 +775,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
break;
case FID_MERGE_TOGGLE:
{
@@ -178,7 +191,7 @@
SfxPoolItem* pItem = 0;
if( rBindings.QueryState( nSlot, pItem ) >= SFX_ITEM_DEFAULT )
bMerge = !static_cast< SfxBoolItem* >( pItem )->GetValue();
-@@ -788,7 +790,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
+@@ -794,7 +796,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
bMoveContents = ((const SfxBoolItem*)pItem)->GetValue();
}
@@ -188,10 +201,10 @@
if (!bApi && bMoveContents) // "ja" im Dialog geklickt
rReq.AppendItem( SfxBoolItem( nSlot, bMoveContents ) );
diff --git sc/source/ui/view/viewfun2.cxx sc/source/ui/view/viewfun2.cxx
-index 3e123c4..b1c289b 100644
+index 2ac164b..a060e8d 100644
--- sc/source/ui/view/viewfun2.cxx
+++ sc/source/ui/view/viewfun2.cxx
-@@ -1086,7 +1086,7 @@ BOOL ScViewFunc::TestMergeCells() // Vorab-Test (fuer Menue)
+@@ -1080,7 +1080,7 @@ BOOL ScViewFunc::TestMergeCells() // Vorab-Test (fuer Menue)
//----------------------------------------------------------------------------
@@ -200,7 +213,7 @@
{
// Editable- und Verschachtelungs-Abfrage muss vorneweg sein (auch in DocFunc),
// damit dann nicht die Inhalte-QueryBox kommt
-@@ -1154,7 +1154,7 @@ BOOL ScViewFunc::MergeCells( BOOL bApi, BOOL& rDoContents, BOOL bRecord )
+@@ -1148,7 +1148,7 @@ BOOL ScViewFunc::MergeCells( BOOL bApi, BOOL& rDoContents, BOOL bRecord )
if (bOk)
{
HideCursor();
@@ -210,10 +223,10 @@
if (bOk)
diff --git sc/uiconfig/scalc/menubar/menubar.xml sc/uiconfig/scalc/menubar/menubar.xml
-index 5bced00..db8ace6 100644
+index d3959a1..06b898c 100644
--- sc/uiconfig/scalc/menubar/menubar.xml
+++ sc/uiconfig/scalc/menubar/menubar.xml
-@@ -217,7 +217,13 @@
+@@ -216,7 +216,13 @@
<menu:menuitem menu:id=".uno:SheetRightToLeft"/>
</menu:menupopup>
</menu:menu>
@@ -228,14 +241,3 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:PageFormatDialog"/>
<menu:menu menu:id=".uno:PrintRangesMenu">
---- officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu 2006-07-03 14:43:29.000000000 +0200
-+++ officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu 2006-07-03 16:44:14.000000000 +0200
-@@ -1009,7 +1009,7 @@
- </node>
- <node oor:name=".uno:ToggleMergeCells" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
-- <value xml:lang="en-US">M~erge Cells</value>
-+ <value xml:lang="en-US">M~erge and Center Cells</value>
- </prop>
- <prop oor:name="Properties" oor:type="xs:int">
- <value>1</value>
Modified: trunk/patches/dev300/sc-xls-builtin-name-scope.diff
==============================================================================
--- trunk/patches/dev300/sc-xls-builtin-name-scope.diff (original)
+++ trunk/patches/dev300/sc-xls-builtin-name-scope.diff Thu Dec 25 06:50:11 2008
@@ -1,11 +1,8 @@
-Index: sc/source/filter/excel/excform.cxx
-===================================================================
-RCS file: /cvs/sc/sc/source/filter/excel/excform.cxx,v
-retrieving revision 1.38
-diff -u -w -p -r1.38 excform.cxx
---- sc/source/filter/excel/excform.cxx 13 Jan 2006 16:56:42 -0000 1.38
-+++ sc/source/filter/excel/excform.cxx 1 Aug 2006 03:32:03 -0000
-@@ -890,7 +890,8 @@ ConvErr ExcelToSc::Convert( const ScToke
+diff --git sc/source/filter/excel/excform.cxx sc/source/filter/excel/excform.cxx
+index eac2890..4b35df6 100644
+--- sc/source/filter/excel/excform.cxx
++++ sc/source/filter/excel/excform.cxx
+@@ -904,7 +904,8 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s
// stream seeks to first byte after <nFormulaLen>
@@ -15,7 +12,7 @@
{
RootData& rR = GetOldRoot();
BYTE nOp, nLen;
-@@ -1058,7 +1059,7 @@ ConvErr ExcelToSc::Convert( _ScRangeList
+@@ -1072,7 +1073,7 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal
ExcRelToScRel( nUINT16, nByte, aSRD, bRangeName );
@@ -24,7 +21,7 @@
break;
case 0x45:
case 0x65:
-@@ -1085,7 +1086,7 @@ ConvErr ExcelToSc::Convert( _ScRangeList
+@@ -1099,7 +1100,7 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal
else if( IsComplRowRange( nRowFirst, nRowLast ) )
SetComplRow( aCRD );
@@ -33,7 +30,7 @@
}
break;
case 0x46:
-@@ -1122,7 +1123,7 @@ ConvErr ExcelToSc::Convert( _ScRangeList
+@@ -1136,7 +1137,7 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal
ExcRelToScRel( nUINT16, nByte, aSRD, bRNorSF );
@@ -42,7 +39,7 @@
}
break;
case 0x4D:
-@@ -1148,7 +1149,7 @@ ConvErr ExcelToSc::Convert( _ScRangeList
+@@ -1162,7 +1163,7 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal
else if( IsComplRowRange( nRowFirst, nRowLast ) )
SetComplRow( aCRD );
@@ -51,7 +48,7 @@
}
break;
case 0x49:
-@@ -1218,10 +1219,10 @@ ConvErr ExcelToSc::Convert( _ScRangeList
+@@ -1232,10 +1233,10 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal
b3D = ( static_cast<SCTAB>(nTabLast) != aEingPos.Tab() );
aCRD.Ref2.SetFlag3D( b3D );
aCRD.Ref2.SetTabRel( FALSE );
@@ -64,7 +61,7 @@
}
}
-@@ -1276,7 +1277,7 @@ ConvErr ExcelToSc::Convert( _ScRangeList
+@@ -1290,7 +1291,7 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal
else if( IsComplRowRange( nRowFirst, nRowLast ) )
SetComplRow( aCRD );
@@ -73,14 +70,11 @@
}//ENDE in aktuellem Workbook
}
break;
-Index: sc/source/filter/excel/excform8.cxx
-===================================================================
-RCS file: /cvs/sc/sc/source/filter/excel/excform8.cxx,v
-retrieving revision 1.38
-diff -u -w -p -r1.38 excform8.cxx
---- sc/source/filter/excel/excform8.cxx 21 Oct 2005 11:55:53 -0000 1.38
-+++ sc/source/filter/excel/excform8.cxx 1 Aug 2006 03:32:03 -0000
-@@ -796,7 +796,8 @@ ConvErr ExcelToSc8::Convert( const ScTok
+diff --git sc/source/filter/excel/excform8.cxx sc/source/filter/excel/excform8.cxx
+index d8cdd74..2580ef8 100644
+--- sc/source/filter/excel/excform8.cxx
++++ sc/source/filter/excel/excform8.cxx
+@@ -871,7 +871,8 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn,
// stream seeks to first byte after <nFormulaLen>
@@ -90,7 +84,7 @@
{
BYTE nOp, nLen;//, nByte;
BOOL bError = FALSE;
-@@ -927,7 +928,7 @@ ConvErr ExcelToSc8::Convert( _ScRangeLis
+@@ -1002,7 +1003,7 @@ ConvErr ExcelToSc8::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sa
ExcRelToScRel8( nRow, nCol, aSRD, bRangeName );
@@ -99,7 +93,7 @@
}
break;
case 0x45:
-@@ -955,7 +956,7 @@ ConvErr ExcelToSc8::Convert( _ScRangeLis
+@@ -1030,7 +1031,7 @@ ConvErr ExcelToSc8::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sa
else if( IsComplRowRange( nRowFirst, nRowLast ) )
SetComplRow( aCRD );
@@ -108,7 +102,7 @@
}
break;
case 0x46:
-@@ -999,7 +1000,7 @@ ConvErr ExcelToSc8::Convert( _ScRangeLis
+@@ -1074,7 +1075,7 @@ ConvErr ExcelToSc8::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sa
ExcRelToScRel8( nRow, nCol, aSRD, bRNorSF );
@@ -117,7 +111,7 @@
}
break;
case 0x4D:
-@@ -1025,7 +1026,7 @@ ConvErr ExcelToSc8::Convert( _ScRangeLis
+@@ -1100,7 +1101,7 @@ ConvErr ExcelToSc8::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sa
else if( IsComplRowRange( nRowFirst, nRowLast ) )
SetComplRow( aCRD );
@@ -126,7 +120,7 @@
}
break;
case 0x4E:
-@@ -1067,10 +1068,10 @@ ConvErr ExcelToSc8::Convert( _ScRangeLis
+@@ -1142,10 +1143,10 @@ ConvErr ExcelToSc8::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sa
aCRD.Ref2.nCol = aSRD.nCol;
aCRD.Ref2.nRow = aSRD.nRow;
aCRD.Ref2.nTab = nLastScTab;
@@ -139,7 +133,7 @@
}
}
break;
-@@ -1103,7 +1104,7 @@ ConvErr ExcelToSc8::Convert( _ScRangeLis
+@@ -1178,7 +1179,7 @@ ConvErr ExcelToSc8::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sa
else if( IsComplRowRange( nRw1, nRw2 ) )
SetComplRow( aCRD );
@@ -148,14 +142,11 @@
}
}
break;
-Index: sc/source/filter/excel/frmbase.cxx
-===================================================================
-RCS file: /cvs/sc/sc/source/filter/excel/frmbase.cxx,v
-retrieving revision 1.6
-diff -u -w -p -r1.6 frmbase.cxx
---- sc/source/filter/excel/frmbase.cxx 8 Sep 2005 18:57:54 -0000 1.6
-+++ sc/source/filter/excel/frmbase.cxx 1 Aug 2006 03:32:03 -0000
-@@ -87,7 +87,7 @@ _ScRangeListTabs::~_ScRangeListTabs()
+diff --git sc/source/filter/excel/frmbase.cxx sc/source/filter/excel/frmbase.cxx
+index 9e6a671..8d77eb8 100644
+--- sc/source/filter/excel/frmbase.cxx
++++ sc/source/filter/excel/frmbase.cxx
+@@ -81,7 +81,7 @@ _ScRangeListTabs::~_ScRangeListTabs()
}
@@ -164,7 +155,7 @@
{
if( b )
{
-@@ -107,19 +107,24 @@ void _ScRangeListTabs::Append( SingleRef
+@@ -101,19 +101,24 @@ void _ScRangeListTabs::Append( SingleRefData a, const BOOL b )
bHasRanges = TRUE;
@@ -193,7 +184,7 @@
{
if( b )
{
-@@ -167,12 +172,17 @@ void _ScRangeListTabs::Append( ComplRefD
+@@ -161,12 +166,17 @@ void _ScRangeListTabs::Append( ComplRefData a, const BOOL b )
bHasRanges = TRUE;
@@ -214,14 +205,11 @@
p->Append( a );
}
-Index: sc/source/filter/excel/xiname.cxx
-===================================================================
-RCS file: /cvs/sc/sc/source/filter/excel/xiname.cxx,v
-retrieving revision 1.9
-diff -u -p -r1.9 xiname.cxx
---- sc/source/filter/excel/xiname.cxx 13 Jun 2007 09:11:04 -0000 1.9
-+++ sc/source/filter/excel/xiname.cxx 25 Oct 2007 13:56:00 -0000
-@@ -174,16 +174,18 @@ XclImpName::XclImpName( XclImpStream& rS
+diff --git sc/source/filter/excel/xiname.cxx sc/source/filter/excel/xiname.cxx
+index 3647a51..72f4701 100644
+--- sc/source/filter/excel/xiname.cxx
++++ sc/source/filter/excel/xiname.cxx
+@@ -160,16 +160,18 @@ XclImpName::XclImpName( XclImpStream& rStrm, sal_uInt16 nXclNameIdx ) :
}
else if( bBuiltIn )
{
@@ -242,39 +230,33 @@
nNameType |= RT_COLHEADER | RT_ROWHEADER;
break;
}
-Index: sc/source/filter/inc/excform.hxx
-===================================================================
-RCS file: /cvs/sc/sc/source/filter/inc/excform.hxx,v
-retrieving revision 1.15
-diff -u -w -p -r1.15 excform.hxx
---- sc/source/filter/inc/excform.hxx 28 Sep 2005 11:56:09 -0000 1.15
-+++ sc/source/filter/inc/excform.hxx 1 Aug 2006 03:32:06 -0000
-@@ -72,7 +72,7 @@ protected:
+diff --git sc/source/filter/inc/excform.hxx sc/source/filter/inc/excform.hxx
+index 68768a4..567a871 100644
+--- sc/source/filter/inc/excform.hxx
++++ sc/source/filter/inc/excform.hxx
+@@ -64,7 +64,7 @@ public:
virtual ConvErr Convert( const ScTokenArray*&, XclImpStream& rStrm, sal_Size nFormulaLen,
bool bAllowArrays, const FORMULA_TYPE eFT = FT_CellFormula );
- virtual ConvErr Convert( _ScRangeListTabs&, XclImpStream& rStrm, sal_Size nFormulaLen, const FORMULA_TYPE eFT = FT_CellFormula );
+ virtual ConvErr Convert( _ScRangeListTabs&, XclImpStream& rStrm, sal_Size nFormulaLen, SCsTAB nTab, const FORMULA_TYPE eFT = FT_CellFormula );
- virtual BOOL GetAbsRefs( ScRangeList& rRangeList, XclImpStream& rStrm, sal_Size nLen );
- void GetDummy( const ScTokenArray*& );
-@@ -124,6 +125,6 @@ public:
+ virtual ConvErr ConvertExternName( const ScTokenArray*& rpArray, XclImpStream& rStrm, sal_Size nFormulaLen,
+ const String& rUrl, const ::std::vector<String>& rTabNames );
+@@ -140,7 +140,7 @@ public:
virtual ConvErr Convert( const ScTokenArray*& rpTokArray, XclImpStream& rStrm, sal_Size nFormulaLen, bool bAllowArrays, const FORMULA_TYPE eFT = FT_CellFormula );
- virtual ConvErr Convert( _ScRangeListTabs&, XclImpStream& rStrm, sal_Size nFormulaLen, const FORMULA_TYPE eFT = FT_CellFormula );
+ virtual ConvErr Convert( _ScRangeListTabs&, XclImpStream& rStrm, sal_Size nFormulaLen, SCsTAB nTab, const FORMULA_TYPE eFT = FT_CellFormula );
- static inline BOOL IsComplRowRange( const UINT16 nRow1, const UINT16 nRow2 );
-
-Index: sc/source/filter/inc/formel.hxx
-===================================================================
-RCS file: /cvs/sc/sc/source/filter/inc/formel.hxx,v
-retrieving revision 1.7
-diff -u -w -p -r1.7 formel.hxx
---- sc/source/filter/inc/formel.hxx 8 Sep 2005 19:19:20 -0000 1.7
-+++ sc/source/filter/inc/formel.hxx 1 Aug 2006 03:32:06 -0000
-@@ -176,8 +176,8 @@ public:
+ virtual ConvErr ConvertExternName( const ScTokenArray*& rpArray, XclImpStream& rStrm, sal_Size nFormulaLen,
+ const String& rUrl, const ::std::vector<String>& rTabNames );
+diff --git sc/source/filter/inc/formel.hxx sc/source/filter/inc/formel.hxx
+index e1be8da..09e2fa7 100644
+--- sc/source/filter/inc/formel.hxx
++++ sc/source/filter/inc/formel.hxx
+@@ -154,8 +154,8 @@ public:
_ScRangeListTabs( void );
virtual ~_ScRangeListTabs();
@@ -285,7 +267,7 @@
inline BOOL HasRanges( void ) const;
-@@ -240,7 +240,7 @@ public:
+@@ -216,7 +216,7 @@ public:
virtual ConvErr Convert( const ScTokenArray*& rpErg, XclImpStream& rStrm, sal_Size nFormulaLen,
bool bAllowArrays, const FORMULA_TYPE eFT = FT_CellFormula ) = 0;
Modified: trunk/patches/dev300/zoom-combobox.diff
==============================================================================
--- trunk/patches/dev300/zoom-combobox.diff (original)
+++ trunk/patches/dev300/zoom-combobox.diff Thu Dec 25 06:50:11 2008
@@ -1,868 +0,0 @@
-Index: sfx2/source/appl/app.src
-===================================================================
-RCS file: /cvs/framework/sfx2/source/appl/app.src,v
-retrieving revision 1.88
-diff -u -r1.88 app.src
---- sfx2/source/appl/app.src 17 Jul 2003 13:14:26 -0000 1.88
-+++ sfx2/source/appl/app.src 20 Aug 2003 21:36:38 -0000
-@@ -3657,6 +3657,14 @@
- };
- ToolBoxItem
- {
-+ Identifier = SID_ATTR_ZOOM ;
-+ };
-+ ToolBoxItem
-+ {
-+ Type = TOOLBOXITEM_SEPARATOR ;
-+ };
-+ ToolBoxItem
-+ {
- Identifier = SID_CLOSEDOC;
- Hide = TRUE;
- };
-Index: svx/inc/helpid.hrc
-===================================================================
-RCS file: /cvs/graphics/svx/inc/helpid.hrc,v
-retrieving revision 1.38
-diff -u -r1.38 helpid.hrc
---- svx/inc/helpid.hrc 30 Apr 2003 08:23:57 -0000 1.38
-+++ svx/inc/helpid.hrc 17 Aug 2003 16:31:26 -0000
-@@ -807,6 +807,8 @@
-
- #define HID_NUMBERFORMAT_WND_NUMBER_PREVIEW (HID_SVX_EXT0_START + 207)
-
-+#define HID_ZOOM_COMBOBOX (HID_SVX_EXT0_START + 189)
-+
- // please adjust ACT_SVX_HID_END2 below if you add entries here!
-
- // -----------------------------------------------------------------------
-@@ -818,7 +820,7 @@
- #error Resource-Ueberlauf in #line, #file
- #endif
-
--#define ACT_SVX_HID_END2 HID_NUMBERFORMAT_WND_NUMBER_PREVIEW
-+#define ACT_SVX_HID_END2 HID_ZOOM_COMBOBOX
- #if ACT_SVX_HID_END2 > HID_SVX_EXT0_END
- #error resource overrun in #line, #file
- #endif
-Index: svx/source/tbxctrls/tbcontrl.src
-===================================================================
-RCS file: /cvs/graphics/svx/source/tbxctrls/tbcontrl.src,v
-retrieving revision 1.35
-diff -u -r1.35 tbcontrl.src
---- svx/source/tbxctrls/tbcontrl.src 17 Jul 2003 11:33:35 -0000 1.35
-+++ svx/source/tbxctrls/tbcontrl.src 17 Aug 2003 16:31:38 -0000
-@@ -263,4 +263,14 @@
- };
-+ComboBox RID_SVXTBX_ZOOM
-+{
-+ HelpId = HID_ZOOM_COMBOBOX ;
-+ Size = MAP_APPFONT ( 30 , 86 ) ;
-+ DropDown = TRUE ;
-+ AutoHScroll = TRUE ;
-+ DDExtraWidth = TRUE ;
-+ Border = TRUE ;
-+ Hide = TRUE ;
-+};
- String RID_SVXSTR_EXTRAS_CHARBACKGROUND
- {
- Text [ en-US ] = "Highlighting" ;
-dummy line to avoid confusing diff-mode
---- sw/source/ui/app/swmodule.cxx 2003-07-07 18:10:23.000000000 +0200
-+++ sw/source/ui/app/swmodule.cxx 2003-08-13 22:52:29.000000000 +0200
-@@ -121,6 +121,7 @@
- #include <svx/fillctrl.hxx>
- #include <svx/tbcontrl.hxx>
- #include <svx/verttexttbxctrl.hxx>
-+#include <svx/zoomtbxctrl.hxx>
- #include <svx/formatpaintbrushctrl.hxx>
- #include <svx/contdlg.hxx>
- #include <svx/layctrl.hxx>
-@@ -573,6 +576,7 @@
- SvxFontSizeMenuControl::RegisterControl(SID_ATTR_CHAR_FONTHEIGHT, pMod );
-
- SwZoomControl::RegisterControl(SID_ATTR_ZOOM, pMod );
-+ SvxZoomToolBoxControl::RegisterControl(SID_ATTR_ZOOM, pMod);
- SwPreviewZoomControl::RegisterControl(FN_PREVIEW_ZOOM, pMod);
- SwHyperlinkControl::RegisterControl(FN_STAT_HYPERLINKS, pMod );
- SvxPosSizeStatusBarControl::RegisterControl(0, pMod );
-
-Index: sw/source/ui/uiview/pview.src
-===================================================================
-RCS file: /cvs/sw/sw/source/ui/uiview/pview.src,v
-retrieving revision 1.28
-diff -u -r1.28 pview.src
---- sw/source/ui/uiview/pview.src 17 Jul 2003 12:04:56 -0000 1.28
-+++ sw/source/ui/uiview/pview.src 20 Aug 2003 21:47:00 -0000
-@@ -1043,11 +1043,6 @@
- Identifier = SID_ZOOM_IN;
- HelpID = SID_ZOOM_IN ;
- };
-- ToolBoxItem
-- {
-- Identifier = FN_PREVIEW_ZOOM;
-- HelpID = HID_PREVIEW_ZOOM ;
-- };
- ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; };
- ToolBoxItem
- {
-Index: sc/source/ui/app/scdll.cxx
-===================================================================
-RCS file: /cvs/sc/sc/source/ui/app/scdll.cxx,v
-retrieving revision 1.14
-diff -u -r1.14 scdll.cxx
---- sc/source/ui/app/scdll.cxx 26 Mar 2003 18:05:47 -0000 1.14
-+++ sc/source/ui/app/scdll.cxx 18 Aug 2003 19:08:47 -0000
-@@ -105,6 +105,7 @@
- #include <svx/selctrl.hxx>
- #include <svx/insctrl.hxx>
- #include <svx/zoomctrl.hxx>
-+#include <svx/zoomtbxctrl.hxx>
- #include <svx/flditem.hxx>
- #include <svx/modctrl.hxx>
- #include <svx/pszctrl.hxx>
-@@ -243,6 +244,7 @@
- SvxInsertStatusBarControl ::RegisterControl(SID_ATTR_INSERT, pMod);
- SvxSelectionModeControl ::RegisterControl(SID_STATUS_SELMODE, pMod);
- SvxZoomStatusBarControl ::RegisterControl(SID_ATTR_ZOOM, pMod);
-+ SvxZoomToolBoxControl ::RegisterControl(SID_ATTR_ZOOM, pMod);
- SvxModifyControl ::RegisterControl(SID_DOC_MODIFIED, pMod);
- XmlSecStatusBarControl ::RegisterControl( SID_SIGNATURE, pMod );
-
-Index: sd/source/ui/app/sddll2.cxx
-===================================================================
-RCS file: /cvs/graphics/sd/source/ui/app/sddll2.cxx,v
-retrieving revision 1.10
-diff -u -r1.10 sddll2.cxx
---- sd/source/ui/app/sddll2.cxx 13 Sep 2002 13:42:54 -0000 1.10
-+++ sd/source/ui/app/sddll2.cxx 18 Aug 2003 19:03:03 -0000
-@@ -114,6 +114,7 @@
- #include <svx/linectrl.hxx>
- #include <svx/tbcontrl.hxx>
- #include <svx/zoomctrl.hxx>
-+#include <svx/zoomtbxctrl.hxx>
- #include <svx/zoomsliderctrl.hxx>
- #include <svx/pszctrl.hxx>
- #include <svx/modctrl.hxx>
-@@ -242,6 +245,7 @@
-
- // StatusBarControls registrieren
- SvxZoomStatusBarControl::RegisterControl( SID_ATTR_ZOOM, pMod );
-+ SvxZoomToolBoxControl::RegisterControl( SID_ATTR_ZOOM, pMod );
- SvxPosSizeStatusBarControl::RegisterControl( SID_ATTR_SIZE, pMod );
- SvxModifyControl::RegisterControl( SID_DOC_MODIFIED, pMod );
- //SvxInsertStatusBarControl::RegisterControl(0, pModd);
-Index: starmath/source/smdll.cxx
-===================================================================
-RCS file: /cvs/sw/starmath/source/smdll.cxx,v
-retrieving revision 1.5
-diff -u -r1.5 smdll.cxx
---- starmath/source/smdll.cxx 12 Oct 2001 15:54:37 -0000 1.5
-+++ starmath/source/smdll.cxx 18 Aug 2003 19:10:56 -0000
-@@ -73,6 +73,7 @@
- #endif
- #include <svx/modctrl.hxx>
- #include <svx/zoomctrl.hxx>
-+#include <svx/zoomtbxctrl.hxx>
- #include <sfx2/docfac.hxx>
- #include <svx/lboxctrl.hxx>
- #include <sfx2/docfile.hxx>
-@@ -147,6 +150,7 @@
- SmViewShell::RegisterFactory(1);
-
- SvxZoomStatusBarControl::RegisterControl( SID_ATTR_ZOOM, pp );
-+ SvxZoomToolBoxControl::RegisterControl( SID_ATTR_ZOOM, pp );
- SvxModifyControl::RegisterControl( SID_TEXTSTATUS, pp );
- SvxUndoRedoControl::RegisterControl( SID_UNDO, pp );
- SvxUndoRedoControl::RegisterControl( SID_REDO, pp );
---- sfx2/inc/sfx2/sfxsids.hrc 2005-02-07 22:41:53.005932054 -0800
-+++ sfx2/inc/sfx2/sfxsids.hrc 2005-02-07 22:42:55.732927520 -0800
-@@ -1114,6 +1116,7 @@
-
- #define SID_SVX_START (SID_LIB_START + 0)
-
-+#define SID_ATTR_ZOOM (SID_SVX_START + 0)
- #define SID_ATTR_CHAR (SID_SVX_START + 6)
- #define SID_ATTR_CHAR_FONT (SID_SVX_START + 7)
- #define SID_ATTR_CHAR_POSTURE (SID_SVX_START + 8)
-
---- svx/inc/svx/svxids.hrc 8 Sep 2005 19:01:37 -0000 1.102
-+++ svx/inc/svx/svxids.hrc 24 Oct 2005 14:48:34 -0000
-@@ -434,6 +434,6 @@
- // --------------------------------------------------------------------------
-
--#define SID_ATTR_ZOOM ( SID_SVX_START + 0 )
-+//#define SID_ATTR_ZOOM ( SID_SVX_START + 0 ) -> sfxsids.hrc
- #define SID_ATTR_BRUSH ( SID_SVX_START + 1 )
- #define SID_ATTR_TABSTOP ( SID_SVX_START + 2 )
- #define SID_ATTR_TABSTOP_DEFAULTS ( SID_SVX_START + 3 )
-
---- svx/source/tbxctrls/makefile.mk 2005-02-10 21:18:28.391273964 -0800
-+++ svx/source/tbxctrls/makefile.mk 2005-02-10 21:18:58.339248608 -0800
-@@ -97,7 +97,8 @@
- $(SLO)$/toolbarmenu.obj \
- $(SLO)$/tbxcolor.obj \
- $(SLO)$/tbxcolorupdate.obj \
-- $(SLO)$/tbunocontroller.obj
-+ $(SLO)$/tbunocontroller.obj \
-+ $(SLO)$/zoomtbxctrl.obj
-
- SRS1NAME=$(TARGET)
- SRC1FILES = \
-
---- svx/inc/svx/dialogs.hrc 2005-02-02 19:27:13.000000000 +0530
-+++ svx/inc/svx/dialogs.hrc 2005-03-29 14:16:08.000000000 +0530
-@@ -243,6 +243,8 @@
-
- // fuer ToolboxControl-Style
- #define RID_SVXTBX_STYLE (RID_SVX_START + 120)
-+// for Zoom Toolbox Control
-+#define RID_SVXTBX_ZOOM (RID_SVX_START + 121)
-
- #define RID_SVXDLG_HYPERLINK (RID_SVX_START + 140)
- #define RID_SVXDLG_PASSWORD (RID_SVX_START + 141)
-@@ -1133,6 +1135,11 @@
- #define RID_SVXSTR_COLOR_CONFIG_SAVE2 (RID_SVX_START + 854)
- #define RID_SVXSTR_COLOR_CONFIG_DELETE (RID_SVX_START + 855)
-
-+// Zoom ComboBox Strings
-+#define RID_SVX_ZOOM_PAGEWIDTH (RID_SVX_START + 856)
-+#define RID_SVX_ZOOM_WHOLEPAGE (RID_SVX_START + 857)
-+#define RID_SVX_ZOOM_OPTIMAL (RID_SVX_START + 858)
-+
- // Accessibility strings. The actual string ids are defined in
- // svx/inc/accessibility.hrc, the strings are defined in
- // svx/source/accessibility/accessibility.src
-
---- svx/source/tbxctrls/tbcontrl.src 2006-07-13 18:04:12.000000000 +0200
-+++ svx/source/tbxctrls/tbcontrl.src 2007-03-15 16:38:38.000000000 +0100
-@@ -129,5 +139,240 @@
- Text [ en-US ] = "Pages";
- };
-+String RID_SVX_ZOOM_WHOLEPAGE
-+{
-+ Text [ de ] = "~Ganze Seite" ;
-+ Text [ en-US ] = "~Entire Page" ;
-+ Text [ af ] = "~Hele bladsy" ;
-+ Text [ ar ] = "~ØÙØØ ÙØÙÙØ" ;
-+ Text [ as-IN ] = "àààààààà àààààà" ;
-+ Text [ be-BY ] = "ÐÑÐÑÐÐÐÐ ÑÐÐÐÐÐ" ;
-+ Text [ bg ] = "~ÐÑÐÐ ÑÑÑÐÐÐÑÐ" ;
-+ Text [ br ] = "Pajenn a-bezh" ;
-+ Text [ bs ] = "~Cijela stranica" ;
-+ Text [ ca ] = "~Tota la pÃgina" ;
-+ Text [ cs ] = "Celà strÃnka" ;
-+ Text [ cy ] = "~Tudalen Gyfan" ;
-+ Text [ da ] = "H~ele siden" ;
-+ Text [ el ] = "ÎÎÏÎÎÎÏÎ ÏÎÎÎÎÎ" ;
-+ Text [ en-GB ] = "~Entire Page" ;
-+ Text [ en-ZA ] = "~Entire Page" ;
-+ Text [ eo ] = "Integra PaÄo" ;
-+ Text [ es ] = "~Toda la pÃgina" ;
-+ Text [ et ] = "Terve lehekÃlg" ;
-+ Text [ fa ] = "~ØØØØØ ØÙØÙ" ;
-+ Text [ fi ] = "~Koko sivu" ;
-+ Text [ fr ] = "Page entiÃre" ;
-+ Text [ ga ] = "L~eathanach ar fad" ;
-+ Text [ gu ] = "ààà ààààà(~E)" ;
-+ Text [ gu-IN ] = "ààà ààààà(~E)" ;
-+ Text [ he ] = "×××× ×××" ;
-+ Text [ hi-IN ] = "àààààààà ààààà (~E)" ;
-+ Text [ hr ] = "~Cijela stranica" ;
-+ Text [ hu ] = "~Teljes oldal" ;
-+ Text [ it ] = "~Pagina intera" ;
-+ Text [ ja ] = "ãããåä(~E)" ;
-+ Text [ ka ] = "~ááááááá áááááá" ;
-+ Text [ km ] = "áááááááááááá " ;
-+ Text [ ko ] = "ìì íìì(~E)" ;
-+ Text [ lt ] = "~Visas puslapis" ;
-+ Text [ mk ] = "~ÐÐÐÐ ÑÑÑÐÐÐÑÐ" ;
-+ Text [ ml-IN ] = "ààààààà àààà" ;
-+ Text [ mr-IN ] = "~ààààààà ààààà" ;
-+ Text [ nb ] = "~Hele siden" ;
-+ Text [ ne ] = "àààààààà ààààà" ;
-+ Text [ nl ] = "H~ele pagina" ;
-+ Text [ nn ] = "~Heile sida" ;
-+ Text [ nr ] = "~Ikhasi Loke" ;
-+ Text [ ns ] = "~Letlakala Ka moka" ;
-+ Text [ or-IN ] = "ààààà àààààà" ;
-+ Text [ pa-IN ] = "àààààà ààà(~E)" ;
-+ Text [ pl ] = "~CaÅa strona" ;
-+ Text [ pt ] = "~PÃgina inteira" ;
-+ Text [ pt-BR ] = "PÃgina int~eira" ;
-+ Text [ ru ] = "ÐÑÑ ÑÑÑÐÐÐÑÐ" ;
-+ Text [ rw ] = "Ipaji yose" ;
-+ Text [ sh-YU ] = "~Cela strana" ;
-+ Text [ sk ] = "~Celà strana" ;
-+ Text [ sl ] = "~Cela stran" ;
-+ Text [ sr-CS ] = "~ÐÐÐÐ ÑÑÑÐÐÐ" ;
-+ Text [ ss ] = "~Lonkhe lipheji" ;
-+ Text [ st ] = "~Leqephe kaofela" ;
-+ Text [ sv ] = "Hela sidan" ;
-+ Text [ sw-TZ ] = "Ukurasa Mzima" ;
-+ Text [ ta ] = "àààààààààààà" ;
-+ Text [ ta-IN ] = "àààààààààààà" ;
-+ Text [ te-IN ] = "ààààà ààààààà" ;
-+ Text [ tg ] = "ÐÐ ÑÐÐÐÐÐÐ ÑÐÒÐÑÐ" ;
-+ Text [ th ] = "~àààààààà" ;
-+ Text [ tn ] = "~Yotlhe Tsebe" ;
-+ Text [ tr ] = "TÃm Sayfa" ;
-+ Text [ ts ] = "~Pheji hinkwaro" ;
-+ Text [ uk ] = "~Entire Page" ;
-+ Text [ ur-IN ] = "ÙÙØØØÙØÛ" ;
-+ Text [ ve ] = "~Siatari Lothe" ;
-+ Text [ vi ] = "~ToÃn trang" ;
-+ Text [ xh ] = "~Ikhasi Liphelele" ;
-+ Text [ zh-CN ] = "æé(~E)" ;
-+ Text [ zh-TW ] = "æé(~E)" ;
-+ Text [ zu ] = "Ikhasi ~lonke" ;
-+ Text [ x-comment ] = " ";
-+};
-+String RID_SVX_ZOOM_PAGEWIDTH
-+{
-+ Text [ de ] = "Seiten~breite" ;
-+ Text [ en-US ] = "~Page Width" ;
-+ Text [ af ] = "~Bladsybreedte" ;
-+ Text [ ar ] = "~ØØØ ØÙØÙØØ" ;
-+ Text [ as-IN ] = "ààààààà àààààà" ;
-+ Text [ be-BY ] = "ÐÑÑÑÐÑ ÑÑÐÑÐÐÐÑ" ;
-+ Text [ bg ] = "~ÐÐÑÐÐÐ ÐÐ ÑÑÑÐÐÐÑÐÑÐ" ;
-+ Text [ br ] = "~Led pajenn" ;
-+ Text [ bs ] = "Åirina ~stranice" ;
-+ Text [ ca ] = "~Ample de pÃgina" ;
-+ Text [ cs ] = "ÅÃÅka strÃnky" ;
-+ Text [ cy ] = "~Lled tudalen" ;
-+ Text [ da ] = "Side~bredde" ;
-+ Text [ el ] = "ÎÎÎÏÎÏ ÏÎÎÎÎÎÏ" ;
-+ Text [ en-GB ] = "~Page Width" ;
-+ Text [ en-ZA ] = "~Page Width" ;
-+ Text [ eo ] = "PaÄa LarÄo" ;
-+ Text [ es ] = "~Ancho de pÃgina" ;
-+ Text [ et ] = "LehekÃlje laius" ;
-+ Text [ fa ] = "~ØØØ ØÙØÙ" ;
-+ Text [ fi ] = "~Sivun leveys" ;
-+ Text [ fr ] = "~Largeur de page" ;
-+ Text [ ga ] = "Leithead ~Leathanaigh" ;
-+ Text [ gu ] = "ààààà àààààà(~P)" ;
-+ Text [ gu-IN ] = "ààààà àààààà(~P)" ;
-+ Text [ he ] = "×××× ××××" ;
-+ Text [ hi-IN ] = "ààààà àààààà (~P)" ;
-+ Text [ hr ] = "~Åirina stranice" ;
-+ Text [ hu ] = "~OldalszÃlessÃg" ;
-+ Text [ it ] = "Larg~h. pagina" ;
-+ Text [ ja ] = "ãããå(~P)" ;
-+ Text [ ka ] = "~ááááááá áááááá" ;
-+ Text [ km ] = "ááááâááááá " ;
-+ Text [ ko ] = "íìì ëë(~P)" ;
-+ Text [ lt ] = "~Puslapio plotis" ;
-+ Text [ mk ] = "ÐÐÑÐÐÐ ÐÐ ~ÑÑÑÐÐÐÑÐ" ;
-+ Text [ ml-IN ] = "àààààààà àààà" ;
-+ Text [ mr-IN ] = "~àààààààà ààààà" ;
-+ Text [ nb ] = "~Sidebredde" ;
-+ Text [ ne ] = "ààààà ààààà" ;
-+ Text [ nl ] = "~Paginabreedte" ;
-+ Text [ nn ] = "~Sidebreidd" ;
-+ Text [ nr ] = "~Ububanzi bekhasi" ;
-+ Text [ ns ] = "~Bophara bja Letlakala" ;
-+ Text [ or-IN ] = "ààààààà àààà" ;
-+ Text [ pa-IN ] = "ààà ààààà(~P)" ;
-+ Text [ pl ] = "SzerokoÅÄ ~strony" ;
-+ Text [ pt ] = "~Largura da pÃgina" ;
-+ Text [ pt-BR ] = "Largura da ~pÃgina" ;
-+ Text [ ru ] = "ÐÐ ÑÐÑÐÐÐ ÑÑÑÐÐÐÑÑ" ;
-+ Text [ rw ] = "Ubugari bw'Urupapuro" ;
-+ Text [ sh-YU ] = "~Åirina strane" ;
-+ Text [ sk ] = "ÅÃrka ~strany" ;
-+ Text [ sl ] = "Åirina s~trani" ;
-+ Text [ sr-CS ] = "~ÐÐÑÐÐÐ ÑÑÑÐÐÐ" ;
-+ Text [ ss ] = "~Bubanti belipheji" ;
-+ Text [ st ] = "~Bophara ba Leqephe" ;
-+ Text [ sv ] = "Sidbredd" ;
-+ Text [ sw-TZ ] = "Upana Ukurasa" ;
-+ Text [ ta ] = "àààà ààààà" ;
-+ Text [ ta-IN ] = "àààà ààààà" ;
-+ Text [ te-IN ] = "ààààà ààààà àààààààà" ;
-+ Text [ tg ] = "ÐÐ ÐÐÑÐ ÑÐÒÐÑÐ" ;
-+ Text [ th ] = "àààààààààààà~àààà" ;
-+ Text [ tn ] = "~Tsebe Bophara" ;
-+ Text [ tr ] = "Sayfa YÃksekliÄi" ;
-+ Text [ ts ] = "~Ku anama ka pheji" ;
-+ Text [ uk ] = "~Page Width" ;
-+ Text [ ur-IN ] = "ØÙØÛ ÚÛ ÚÙÚØØÛ" ;
-+ Text [ ve ] = "~Vhuphara ha Siatari" ;
-+ Text [ vi ] = "Äá ~ráng trang" ;
-+ Text [ xh ] = "~Ububanzi Bekhasi" ;
-+ Text [ zh-CN ] = "ééåå(~P)" ;
-+ Text [ zh-TW ] = "ééåå(~P)" ;
-+ Text [ zu ] = "Ububanzi be~khasi" ;
-+ Text [ x-comment ] = " ";
-+};
-+String RID_SVX_ZOOM_OPTIMAL
-+{
-+ Text [ de ] = "~Optimal" ;
-+ Text [ en-US ] = "~Optimal" ;
-+ Text [ af ] = "~Optimale" ;
-+ Text [ ar ] = "ØÙØÙ~ØÙ" ;
-+ Text [ be-BY ] = "ÐÐÑÑÐÐÐÑÐÐ" ;
-+ Text [ bg ] = "~ÐÐÑÐÐÐÐÐÐ" ;
-+ Text [ br ] = "~Gwellek" ;
-+ Text [ bs ] = "~Optimalno" ;
-+ Text [ ca ] = "Ã~ptim" ;
-+ Text [ cs ] = "OptimÃlnÃ" ;
-+ Text [ cy ] = "~Gorau" ;
-+ Text [ da ] = "~Optimal" ;
-+ Text [ el ] = "ÎÎ~ÎÏÎÏÏÎ" ;
-+ Text [ en-GB ] = "~Optimal" ;
-+ Text [ en-ZA ] = "~Optimal" ;
-+ Text [ eo ] = "~Optimal" ;
-+ Text [ es ] = "Ã~ptimo" ;
-+ Text [ et ] = "Optimaalne" ;
-+ Text [ fa ] = "~ØÙÛÙÙ" ;
-+ Text [ fi ] = "O~ptimaalinen" ;
-+ Text [ fr ] = "~Optimal" ;
-+ Text [ ga ] = "~Optamach" ;
-+ Text [ gu ] = "ààààààà (~O)" ;
-+ Text [ gu-IN ] = "ààààààà (~O)" ;
-+ Text [ he ] = "×××××" ;
-+ Text [ hi-IN ] = "~Optimal" ;
-+ Text [ hr ] = "~Optimalno" ;
-+ Text [ hu ] = "~OptimÃlis" ;
-+ Text [ it ] = "~Ottimale" ;
-+ Text [ ja ] = "æé(~O)" ;
-+ Text [ ka ] = "~áááááááááá" ;
-+ Text [ km ] = "ááááááâááááá " ;
-+ Text [ ko ] = "ìì(~O)" ;
-+ Text [ ku ] = "D~Ãnamik" ;
-+ Text [ lt ] = "~Optimalus" ;
-+ Text [ mk ] = "~ÐÐÑÐÐÐÐÐÐ" ;
-+ Text [ nb ] = "~Best mulig" ;
-+ Text [ ne ] = "àààààà" ;
-+ Text [ nl ] = "~Optimaal" ;
-+ Text [ nn ] = "~Best mogleg" ;
-+ Text [ nr ] = "~Ngaletha ipumelelo" ;
-+ Text [ ns ] = "~Kgolo" ;
-+ Text [ or-IN ] = "ààààààà" ;
-+ Text [ pa-IN ] = "àààààà(~O)" ;
-+ Text [ pl ] = "~Optymalny" ;
-+ Text [ pt ] = "~Optimizado" ;
-+ Text [ pt-BR ] = "~Ideal" ;
-+ Text [ ru ] = "ÐÐÑÐÐÐÐÑÐÐ" ;
-+ Text [ rw ] = "Gihamye" ;
-+ Text [ sh-YU ] = "~Optimalan" ;
-+ Text [ sk ] = "~OptimÃlny" ;
-+ Text [ sl ] = "~Optimalno" ;
-+ Text [ sr-CS ] = "~ÐÐÑÐÐÐÐÐÐ" ;
-+ Text [ ss ] = "~Kwekugcina" ;
-+ Text [ st ] = "~E fetisisang" ;
-+ Text [ sv ] = "Optimal" ;
-+ Text [ sw-TZ ] = "Sadifu" ;
-+ Text [ ta ] = "~ààààààà" ;
-+ Text [ ta-IN ] = "~ààààààà" ;
-+ Text [ te-IN ] = "ààààààààà" ;
-+ Text [ tg ] = "ÐÐÑÐÐÐÐÓ" ;
-+ Text [ th ] = "à~àààààààààà" ;
-+ Text [ tn ] = "~Nepagetse" ;
-+ Text [ tr ] = "En Uygun" ;
-+ Text [ ts ] = "~Mpimo wa le makumu" ;
-+ Text [ uk ] = "ÐÐÑÐÐÐÐÑÐÐÐ" ;
-+ Text [ ur-IN ] = "ÙÙØØØ" ;
-+ Text [ ve ] = "~Oputimala" ;
-+ Text [ vi ] = "Tái Æ~u" ;
-+ Text [ xh ] = "~Okufaneleke ncam" ;
-+ Text [ zh-CN ] = "æä(~O)" ;
-+ Text [ zh-TW ] = "æåé(~O)" ;
-+ Text [ zu ] = "~Okuthandwayo" ;
-+ Text [ x-comment ] = " ";
-+};
- Image RID_SVXIMG_GRAF_RED
- {
- ImageBitmap = Bitmap { File = "sc10865.bmp" ; };
-
---- /dev/null 2004-08-25 23:04:59.000000000 +0530
-+++ svx/source/tbxctrls/zoomtbxctrl.cxx 2005-04-01 15:02:35.346989875 +0530
-@@ -0,0 +1,281 @@
-+/*************************************************************************
-+ *
-+ * $RCSfile$
-+ *
-+ * $Revision$
-+ *
-+ * last change: $Author$ $Date$
-+ *
-+ * The Contents of this file are made available subject to the terms of
-+ * either of the following licenses
-+ *
-+ * - GNU Lesser General Public License Version 2.1
-+ * - Sun Industry Standards Source License Version 1.1
-+ *
-+ * Sun Microsystems Inc., October, 2000
-+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2000 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, as published by the Free Software Foundation.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ *
-+ *
-+ * Sun Industry Standards Source License Version 1.1
-+ * =================================================
-+ * The contents of this file are subject to the Sun Industry Standards
-+ * Source License Version 1.1 (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.openoffice.org/license.html.
-+ *
-+ * Software provided under this License is provided on an "AS IS" basis,
-+ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ * See the License for the specific provisions governing your rights and
-+ * obligations concerning the Software.
-+ *
-+ * The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ * Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ * All Rights Reserved.
-+ *
-+ * Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <string> // HACK: prevent conflict between STLPORT and Workshop headers
-+
-+#include <vcl/toolbox.hxx>
-+#include <sfx2/app.hxx>
-+#include <sfx2/dispatch.hxx>
-+#include <sfx2/viewsh.hxx>
-+#include <vcl/combobox.hxx>
-+
-+#include <svx/dialogs.hrc>
-+
-+#include <svx/zoomtbxctrl.hxx>
-+#include <svx/zoomitem.hxx>
-+#include <svx/dialmgr.hxx>
-+
-+#define MINZOOM 20
-+#define MAXZOOM 600
-+#define DEFAULT_ZOOM 100
-+
-+using namespace ::rtl;
-+using namespace ::com::sun::star::uno;
-+using namespace ::com::sun::star::beans;
-+using namespace ::com::sun::star::frame;
-+
-+using namespace ::com::sun::star::frame;
-+
-+SFX_IMPL_TOOLBOX_CONTROL( SvxZoomToolBoxControl, SvxZoomItem);
-+
-+class SvxZoomBox_Impl : public ComboBox
-+{
-+ USHORT nSlotId;
-+ BOOL bRelease;
-+ OUString maWholePage;
-+ OUString maOptimal;
-+ OUString maPageWidth;
-+
-+ ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > m_xDispatchProvider;
-+
-+public:
-+ SvxZoomBox_Impl( Window* pParent, USHORT nSlot, const Reference< XDispatchProvider >& rDispatchProvider );
-+ ~SvxZoomBox_Impl();
-+
-+protected:
-+ virtual void Select();
-+ virtual long Notify( NotifyEvent& rNEvt );
-+
-+ void ReleaseFocus();
-+
-+};
-+
-+static String RemoveTilda( USHORT nId )
-+{
-+ return String( SVX_RESSTR ( nId ) ).EraseAllChars('~');
-+}
-+
-+SvxZoomBox_Impl::SvxZoomBox_Impl(
-+ Window* pParent,
-+ USHORT nSlot,
-+ const Reference< XDispatchProvider >& rDispatchProvider ):
-+ ComboBox( pParent, SVX_RES(RID_SVXTBX_ZOOM)),
-+ nSlotId(nSlot),
-+ bRelease(TRUE),
-+ m_xDispatchProvider( rDispatchProvider ),
-+ maPageWidth( RemoveTilda ( RID_SVX_ZOOM_PAGEWIDTH ) ),
-+ maOptimal( RemoveTilda ( RID_SVX_ZOOM_OPTIMAL ) ),
-+ maWholePage( RemoveTilda ( RID_SVX_ZOOM_WHOLEPAGE ) )
-+{
-+ EnableAutocomplete( FALSE );
-+ USHORT aZoomValues[] =
-+ {25, 50, 75, 100, 150, 200 };
-+ for(USHORT i = 0; i < sizeof(aZoomValues)/sizeof(USHORT); i++)
-+ {
-+ String sEntry = String::CreateFromInt32( aZoomValues[i] );
-+ sEntry += '%';
-+ InsertEntry( sEntry );
-+ }
-+ InsertEntry( maPageWidth );
-+ InsertEntry( maOptimal );
-+ InsertEntry( maWholePage );
-+}
-+
-+SvxZoomBox_Impl::~SvxZoomBox_Impl()
-+{}
-+
-+void SvxZoomBox_Impl::Select()
-+{
-+ if ( !IsTravelSelect() )
-+ {
-+ String sEntry( GetText() );
-+ sEntry.EraseAllChars( '%' );
-+ SvxZoomType ZoomType;
-+ USHORT nZoom = DEFAULT_ZOOM;
-+ if( maWholePage == OUString( sEntry ) )
-+ {
-+ nSlotId = SID_SIZE_PAGE;
-+ ZoomType = SVX_ZOOM_WHOLEPAGE;
-+ }
-+ else if( maPageWidth == OUString( sEntry ) )
-+ {
-+ nSlotId = SID_SIZE_PAGE_WIDTH;
-+ ZoomType = SVX_ZOOM_PAGEWIDTH;
-+ }
-+ else if( maOptimal == OUString( sEntry ) )
-+ {
-+ nSlotId = SID_SIZE_ALL;
-+ ZoomType = SVX_ZOOM_OPTIMAL;
-+ }
-+ else
-+ {
-+ nZoom = (USHORT)sEntry.ToInt32();
-+ if(nZoom < MINZOOM)
-+ nZoom = MINZOOM;
-+ if(nZoom > MAXZOOM)
-+ nZoom = MAXZOOM;
-+
-+ nSlotId = SID_ATTR_ZOOM;
-+ ZoomType = SVX_ZOOM_PERCENT;
-+ }
-+
-+ SvxZoomItem aItem ( ZoomType , nZoom, nSlotId );
-+ Any a;
-+ Sequence< PropertyValue > aArgs( 1 );
-+ aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Zoom" ));
-+ aItem.QueryValue( a );
-+ aArgs[0].Value = a;
-+ SfxToolBoxControl::Dispatch(
-+ m_xDispatchProvider,
-+ rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:Zoom" )),
-+ aArgs );
-+ }
-+ ReleaseFocus();
-+}
-+
-+
-+long SvxZoomBox_Impl::Notify( NotifyEvent& rNEvt )
-+{
-+ long nHandled = 0;
-+ if ( rNEvt.GetType() == EVENT_KEYINPUT )
-+ {
-+ USHORT nCode = rNEvt.GetKeyEvent()->GetKeyCode().GetCode();
-+ switch ( nCode )
-+ {
-+ case KEY_RETURN:
-+ case KEY_TAB:
-+ {
-+ if ( KEY_TAB == nCode )
-+ bRelease = FALSE;
-+ else
-+ nHandled = 1;
-+ Select();
-+ break;
-+ }
-+
-+ case KEY_ESCAPE:
-+ SetText( GetSavedValue() );
-+ ReleaseFocus();
-+ break;
-+ }
-+ }
-+ else if ( EVENT_LOSEFOCUS == rNEvt.GetType() )
-+ {
-+ Window* pFocusWin = Application::GetFocusWindow();
-+ if ( !HasFocus() && GetSubEdit() != pFocusWin )
-+ SetText( GetSavedValue() );
-+ }
-+
-+ return nHandled ? nHandled : ComboBox::Notify( rNEvt );
-+}
-+
-+void SvxZoomBox_Impl::ReleaseFocus()
-+{
-+ if ( !bRelease )
-+ {
-+ bRelease = TRUE;
-+ return;
-+ }
-+ SfxViewShell* pCurSh = SfxViewShell::Current();
-+
-+ if ( pCurSh )
-+ {
-+ Window* pShellWnd = pCurSh->GetWindow();
-+
-+ if ( pShellWnd )
-+ pShellWnd->GrabFocus();
-+ }
-+}
-+
-+SvxZoomToolBoxControl::SvxZoomToolBoxControl( USHORT nSlotID,
-+ USHORT nID,
-+ ToolBox& rBox )
-+: SfxToolBoxControl( nSlotID, nID, rBox )
-+{
-+}
-+
-+SvxZoomToolBoxControl::~SvxZoomToolBoxControl()
-+{
-+}
-+
-+void SvxZoomToolBoxControl::StateChanged( USHORT nSID,
-+ SfxItemState eState,
-+ const SfxPoolItem* pState )
-+{
-+ USHORT nId = GetId();
-+ GetToolBox().EnableItem( nId, (GetItemState(pState) != SFX_ITEM_DISABLED) );
-+ SvxZoomBox_Impl* pBox = (SvxZoomBox_Impl*)GetToolBox().GetItemWindow( GetId() );
-+ if(SFX_ITEM_AVAILABLE <= eState)
-+ {
-+ String sZoom(String::CreateFromInt32(((const SvxZoomItem*)pState)->GetValue()));
-+ sZoom += '%';
-+ pBox->SetText(sZoom);
-+ pBox->SaveValue();
-+ }
-+}
-+
-+Window* SvxZoomToolBoxControl::CreateItemWindow( Window *pParent )
-+{
-+
-+ SvxZoomBox_Impl* pRet = new SvxZoomBox_Impl( pParent, GetSlotId(), Reference< XDispatchProvider >( m_xFrame->getController(), UNO_QUERY ));
-+
-+ return pRet;
-+}
-
---- svx/prj/d.lst 2007-05-02 21:06:36.000000000 +0200
-+++ svx/prj/d.lst 2007-05-02 21:12:15.000000000 +0200
-@@ -425,6 +425,7 @@ mkdir: %_DEST%\inc%_EXT%\svx
- ..\inc\xexch.hxx %_DEST%\inc%_EXT%\svx\xexch.hxx
- ..\inc\zoomctrl.hxx %_DEST%\inc%_EXT%\svx\zoomctrl.hxx
- ..\inc\svx\zoomitem.hxx %_DEST%\inc%_EXT%\svx\zoomitem.hxx
-+..\inc\svx\zoomtbxctrl.hxx %_DEST%\inc%_EXT%\svx\zoomtbxctrl.hxx
- ..\inc\svx\viewlayoutitem.hxx %_DEST%\inc%_EXT%\svx\viewlayoutitem.hxx
- ..\inc\svx\zoomslideritem.hxx %_DEST%\inc%_EXT%\svx\zoomslideritem.hxx
- ..\inc\svx\zoomsliderctrl.hxx %_DEST%\inc%_EXT%\svx\zoomsliderctrl.hxx
---- /dev/null 2004-08-25 23:04:59.000000000 +0530
-+++ svx/inc/svx/zoomtbxctrl.hxx 2005-04-07 16:50:49.483537921 +0530
-@@ -0,0 +1,90 @@
-+/*************************************************************************
-+ *
-+ *
-+ *
-+ *
-+ *
-+ *
-+ *
-+ * The Contents of this file are made available subject to the terms of
-+ * either of the following licenses
-+ *
-+ * - GNU Lesser General Public License Version 2.1
-+ * - Sun Industry Standards Source License Version 1.1
-+ *
-+ * Sun Microsystems Inc., October, 2000
-+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2000 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, as published by the Free Software Foundation.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ *
-+ *
-+ * Sun Industry Standards Source License Version 1.1
-+ * =================================================
-+ * The contents of this file are subject to the Sun Industry Standards
-+ * Source License Version 1.1 (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.openoffice.org/license.html.
-+ *
-+ * Software provided under this License is provided on an "AS IS" basis,
-+ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+ * See the License for the specific provisions governing your rights and
-+ * obligations concerning the Software.
-+ *
-+ * The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+ *
-+ * Copyright: 2000 by Sun Microsystems, Inc.
-+ *
-+ * All Rights Reserved.
-+ *
-+ * Contributor(s): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+#ifndef _SVX_ZOOMTBXCTRL_HXX
-+#define _SVX_ZOOMTBXCTRL_HXX
-+
-+#ifndef _SFXTBXCTRL_HXX
-+#include <sfx2/tbxctrl.hxx>
-+#endif
-+
-+#ifndef INCLUDED_SVXDLLAPI_H
-+#include <svx/svxdllapi.h>
-+#endif
-+
-+class SVX_DLLPUBLIC SvxZoomToolBoxControl : public SfxToolBoxControl
-+{
-+public:
-+ SFX_DECL_TOOLBOX_CONTROL();
-+
-+ SvxZoomToolBoxControl( USHORT nSlotID,
-+ USHORT nID,
-+ ToolBox& rBox
-+ );
-+ ~SvxZoomToolBoxControl();
-+
-+ virtual void StateChanged( USHORT nSID,
-+ SfxItemState eState,
-+ const SfxPoolItem* pState );
-+
-+ virtual Window* CreateItemWindow( Window *pParent );
-+};
-+
-+#endif // _SVX_ZOOMTBXCTRL_HXX
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
