GNOME.org
 

ooo-build r14973 - in trunk: . patches/dev300

Author: kyoshida
Date: Tue Dec 30 19:13:26 2008
New Revision: 14973
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14973&view=rev

Log:
2008-12-30  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/zoom-combobox.diff: I had accidentally left this patch
	a 0-byte file.  Re-created it.


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/zoom-combobox.diff

Modified: trunk/patches/dev300/zoom-combobox.diff
==============================================================================
--- trunk/patches/dev300/zoom-combobox.diff	(original)
+++ trunk/patches/dev300/zoom-combobox.diff	Tue Dec 30 19:13:26 2008
@@ -0,0 +1,859 @@
+diff --git sc/source/ui/app/scdll.cxx sc/source/ui/app/scdll.cxx
+index 279e682..93df8d1 100644
+--- sc/source/ui/app/scdll.cxx
++++ sc/source/ui/app/scdll.cxx
+@@ -96,6 +96,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>
+@@ -270,6 +271,7 @@ void ScDLL::Init()
+ 	SvxInsertStatusBarControl		::RegisterControl(SID_ATTR_INSERT,		pMod);
+ 	SvxSelectionModeControl			::RegisterControl(SID_STATUS_SELMODE,	pMod);
+ 	SvxZoomStatusBarControl			::RegisterControl(SID_ATTR_ZOOM,		pMod);
++    SvxZoomToolBoxControl           ::RegisterControl(SID_ATTR_ZOOM,        pMod);
+     SvxZoomSliderControl            ::RegisterControl(SID_ATTR_ZOOMSLIDER,  pMod);
+ 	SvxModifyControl 				::RegisterControl(SID_DOC_MODIFIED,		pMod);
+ 	XmlSecStatusBarControl          ::RegisterControl( SID_SIGNATURE,       pMod );
+diff --git sd/source/ui/app/sddll2.cxx sd/source/ui/app/sddll2.cxx
+index 42466c7..ffd629a 100644
+--- sd/source/ui/app/sddll2.cxx
++++ sd/source/ui/app/sddll2.cxx
+@@ -52,6 +52,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>
+@@ -192,6 +193,7 @@ void SdDLL::RegisterControllers()
+ 
+ 	// 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);
+diff --git sfx2/inc/sfx2/sfxsids.hrc sfx2/inc/sfx2/sfxsids.hrc
+index 0a47f2e..6c14b61 100644
+--- sfx2/inc/sfx2/sfxsids.hrc
++++ sfx2/inc/sfx2/sfxsids.hrc
+@@ -1128,6 +1128,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)
+diff --git sfx2/source/appl/app.src sfx2/source/appl/app.src
+index 7191e24..b2e23c8 100644
+--- sfx2/source/appl/app.src
++++ sfx2/source/appl/app.src
+@@ -862,6 +862,14 @@ ToolBox RID_ENVTOOLBOX
+ 		};
+ 		ToolBoxItem
+ 		{
++			Identifier = SID_ATTR_ZOOM ;
++		};
++		ToolBoxItem
++		{
++			Type = TOOLBOXITEM_SEPARATOR ;
++		};
++		ToolBoxItem
++		{
+ 			Identifier = SID_CLOSEDOC;
+ 			Hide = TRUE;
+ 		};
+diff --git starmath/source/smdll.cxx starmath/source/smdll.cxx
+index f21c4a2..27ff634 100644
+--- starmath/source/smdll.cxx
++++ starmath/source/smdll.cxx
+@@ -38,6 +38,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>
+@@ -90,6 +91,7 @@ void SmDLL::Init()
+ 	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 );
+diff --git svx/inc/helpid.hrc svx/inc/helpid.hrc
+index b28d7c8..fb5d6ab 100644
+--- svx/inc/helpid.hrc
++++ svx/inc/helpid.hrc
+@@ -809,6 +809,8 @@
+ 
+ #define HID_NUMBERFORMAT_WND_NUMBER_PREVIEW         (HID_SVX_EXT0_START + 207)
+ #define HID_SPLDLG_BUTTON_IGNORERULE                (HID_SVX_EXT0_START + 208)
++#define HID_ZOOM_COMBOBOX                           (HID_SVX_EXT0_START + 209)
++
+ // please adjust ACT_SVX_HID_END2 below if you add entries here!
+ 
+ // -----------------------------------------------------------------------
+@@ -820,7 +822,7 @@
+ #error Resource-Ueberlauf in #line, #file
+ #endif
+ 
+-#define ACT_SVX_HID_END2    HID_SPLDLG_BUTTON_IGNORERULE
++#define ACT_SVX_HID_END2    HID_ZOOM_COMBOBOX
+ #if ACT_SVX_HID_END2 > HID_SVX_EXT0_END
+ #error resource overrun in #line, #file
+ #endif
+diff --git svx/inc/svx/dialogs.hrc svx/inc/svx/dialogs.hrc
+index 5b97919..09ca8e1 100644
+--- svx/inc/svx/dialogs.hrc
++++ svx/inc/svx/dialogs.hrc
+@@ -229,6 +229,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)
+@@ -1117,6 +1119,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
+diff --git svx/inc/svx/svxids.hrc svx/inc/svx/svxids.hrc
+index ca5997b..86f2a9d 100644
+--- svx/inc/svx/svxids.hrc
++++ svx/inc/svx/svxids.hrc
+@@ -425,7 +425,7 @@
+ // Svx-Id's
+ // --------------------------------------------------------------------------
+ 
+-#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 )
+diff --git svx/inc/svx/zoomtbxctrl.hxx svx/inc/svx/zoomtbxctrl.hxx
+new file mode 100644
+index 0000000..c155a2e
+--- /dev/null
++++ svx/inc/svx/zoomtbxctrl.hxx
+@@ -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
+diff --git svx/prj/d.lst svx/prj/d.lst
+index d76d23d..71d507e 100644
+--- svx/prj/d.lst
++++ svx/prj/d.lst
+@@ -414,6 +414,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
+diff --git svx/source/tbxctrls/makefile.mk svx/source/tbxctrls/makefile.mk
+index 5e7acbb..9de74b6 100644
+--- svx/source/tbxctrls/makefile.mk
++++ svx/source/tbxctrls/makefile.mk
+@@ -61,7 +61,8 @@ SLOFILES=	\
+ 		$(SLO)$/subtoolboxcontrol.obj \
+         $(SLO)$/tbxcolor.obj \
+         $(SLO)$/tbxcolorupdate.obj \
+-        $(SLO)$/tbunocontroller.obj
++        $(SLO)$/tbunocontroller.obj \
++        $(SLO)$/zoomtbxctrl.obj	
+ 
+ SRS1NAME=$(TARGET)
+ SRC1FILES = \
+diff --git svx/source/tbxctrls/tbcontrl.src svx/source/tbxctrls/tbcontrl.src
+index b061e0e..e5910ad 100644
+--- svx/source/tbxctrls/tbcontrl.src
++++ svx/source/tbxctrls/tbcontrl.src
+@@ -93,6 +93,16 @@ ComboBox RID_SVXTBX_STYLE
+ 	Border = TRUE ;
+ 	Hide = TRUE ;
+ };
++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" ;
+@@ -109,6 +119,241 @@ String RID_SVXSTR_PAGES
+ {
+     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" ; };
+diff --git svx/source/tbxctrls/zoomtbxctrl.cxx svx/source/tbxctrls/zoomtbxctrl.cxx
+new file mode 100644
+index 0000000..f9554c9
+--- /dev/null
++++ svx/source/tbxctrls/zoomtbxctrl.cxx
+@@ -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;
++}
+diff --git sw/source/ui/app/swmodule.cxx sw/source/ui/app/swmodule.cxx
+index 15ddf24..e207157 100644
+--- sw/source/ui/app/swmodule.cxx
++++ sw/source/ui/app/swmodule.cxx
+@@ -52,6 +52,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>
+@@ -428,6 +429,7 @@ void SwDLL::RegisterControls()
+ 	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);
+ 	SvxPosSizeStatusBarControl::RegisterControl(0, pMod );
+ 	SvxInsertStatusBarControl::RegisterControl(SID_ATTR_INSERT, pMod );
+diff --git sw/source/ui/uiview/pview.src sw/source/ui/uiview/pview.src
+index 3b36866..ed8de1c 100644
+--- sw/source/ui/uiview/pview.src
++++ sw/source/ui/uiview/pview.src
+@@ -437,11 +437,6 @@ ToolBox RID_PVIEW_TOOLBOX
+             Identifier = SID_ZOOM_IN;
+             HelpID = SID_ZOOM_IN ;
+         };
+-        ToolBoxItem
+-		{
+-			Identifier = FN_PREVIEW_ZOOM;
+-			HelpID = HID_PREVIEW_ZOOM ;
+-		};
+ 		ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; };
+ 		ToolBoxItem
+ 		{
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]