1 Index: sfx2/inc/sfxsids.hrc
2 ===================================================================
3 RCS file: /cvs/framework/sfx2/inc/sfxsids.hrc,v
4 retrieving revision 1.50
5 diff -u -r1.50 sfxsids.hrc
6 --- sfx2/inc/sfxsids.hrc 16 May 2003 14:14:50 -0000 1.50
7 +++ sfx2/inc/sfxsids.hrc 20 Aug 2003 21:41:32 -0000
9 #define SID_HYPERLINK_SETLINK (SID_SVX_START + 362)
11 #define SID_ZOOM (SID_SVX_START + 289)
12 +#define SID_ATTR_ZOOM (SID_SVX_START + 0)
13 #define SID_ZOOM_TOOLBOX (SID_SVX_START + 96)
14 #define SID_ZOOM_OUT (SID_SVX_START + 97)
15 #define SID_ZOOM_IN (SID_SVX_START + 98)
16 Index: sfx2/source/appl/app.src
17 ===================================================================
18 RCS file: /cvs/framework/sfx2/source/appl/app.src,v
19 retrieving revision 1.88
20 diff -u -r1.88 app.src
21 --- sfx2/source/appl/app.src 17 Jul 2003 13:14:26 -0000 1.88
22 +++ sfx2/source/appl/app.src 20 Aug 2003 21:36:38 -0000
23 @@ -3657,6 +3657,14 @@
27 + Identifier = SID_ATTR_ZOOM ;
31 + Type = TOOLBOXITEM_SEPARATOR ;
35 Identifier = SID_CLOSEDOC;
38 cvs server: Diffing svx
39 cvs server: Diffing svx/inc
40 Index: svx/inc/dialogs.hrc
41 ===================================================================
42 RCS file: /cvs/graphics/svx/inc/dialogs.hrc,v
43 retrieving revision 1.48
44 diff -u -r1.48 dialogs.hrc
45 --- svx/inc/dialogs.hrc 17 Apr 2003 17:39:50 -0000 1.48
46 +++ svx/inc/dialogs.hrc 17 Aug 2003 16:31:10 -0000
49 // fuer ToolboxControl-Style
50 #define RID_SVXTBX_STYLE (RID_SVX_START + 120)
51 +// for Zoom Toolbox Control
52 +#define RID_SVXTBX_ZOOM (RID_SVX_START + 121)
54 #define RID_SVXDLG_HYPERLINK (RID_SVX_START + 140)
55 #define RID_SVXDLG_PASSWORD (RID_SVX_START + 141)
56 Index: svx/inc/helpid.hrc
57 ===================================================================
58 RCS file: /cvs/graphics/svx/inc/helpid.hrc,v
59 retrieving revision 1.38
60 diff -u -r1.38 helpid.hrc
61 --- svx/inc/helpid.hrc 30 Apr 2003 08:23:57 -0000 1.38
62 +++ svx/inc/helpid.hrc 17 Aug 2003 16:31:26 -0000
64 #define HID_HANGULDLG_BUTTON_CHANGEALL (HID_SVX_EXT0_START + 25)
65 #define HID_SPLDLG_EDIT_NEWWORD (HID_SVX_EXT0_START + 26)
66 #define HID_HANGULDLG_EDIT_NEWWORD (HID_SVX_EXT0_START + 27)
67 +#define HID_ZOOM_COMBOBOX (HID_SVX_EXT0_START + 28)
70 // -----------------------------------------------------------------------
75 -#define ACT_SVX_HID_END2 HID_OPTIONS_CTL
76 +#define ACT_SVX_HID_END2 HID_ZOOM_COMBOBOX
78 #if ACT_SVX_HID2_END > HID_SVX_EXT0_END
79 #error resource overrun in #line, #file
80 Index: svx/source/tbxctrls/makefile.mk
81 ===================================================================
82 RCS file: /cvs/graphics/svx/source/tbxctrls/makefile.mk,v
83 retrieving revision 1.4
84 diff -u -r1.4 makefile.mk
85 --- svx/source/tbxctrls/makefile.mk 2 May 2001 12:17:05 -0000 1.4
86 +++ svx/source/tbxctrls/makefile.mk 17 Aug 2003 16:31:32 -0000
88 $(SLO)$/tbxalign.obj \
90 $(SLO)$/tbxdrctl.obj \
91 - $(SLO)$/verttexttbxctrl.obj
92 + $(SLO)$/verttexttbxctrl.obj \
93 + $(SLO)$/zoomtbxctrl.obj
97 Index: svx/source/tbxctrls/tbcontrl.src
98 ===================================================================
99 RCS file: /cvs/graphics/svx/source/tbxctrls/tbcontrl.src,v
100 retrieving revision 1.35
101 diff -u -r1.35 tbcontrl.src
102 --- svx/source/tbxctrls/tbcontrl.src 17 Jul 2003 11:33:35 -0000 1.35
103 +++ svx/source/tbxctrls/tbcontrl.src 17 Aug 2003 16:31:38 -0000
108 +ComboBox RID_SVXTBX_ZOOM
110 + HelpId = HID_ZOOM_COMBOBOX ;
111 + Size = MAP_APPFONT ( 30 , 86 ) ;
113 + AutoHScroll = TRUE ;
114 + DDExtraWidth = TRUE ;
118 String RID_SVXSTR_EXTRAS_CHARBACKGROUND
120 Text = "Zeichenhintergrund" ;
122 --- /dev/null 2003-02-11 15:36:20.000000000 +0100
123 +++ svx/inc/zoomtbxctrl.hxx 2003-08-17 18:25:11.000000000 +0200
125 +/*************************************************************************
131 + * last change: $Author$ $Date$
133 + * The Contents of this file are made available subject to the terms of
134 + * either of the following licenses
136 + * - GNU Lesser General Public License Version 2.1
137 + * - Sun Industry Standards Source License Version 1.1
139 + * Sun Microsystems Inc., October, 2000
141 + * GNU Lesser General Public License Version 2.1
142 + * =============================================
143 + * Copyright 2000 by Sun Microsystems, Inc.
144 + * 901 San Antonio Road, Palo Alto, CA 94303, USA
146 + * This library is free software; you can redistribute it and/or
147 + * modify it under the terms of the GNU Lesser General Public
148 + * License version 2.1, as published by the Free Software Foundation.
150 + * This library is distributed in the hope that it will be useful,
151 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
152 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
153 + * Lesser General Public License for more details.
155 + * You should have received a copy of the GNU Lesser General Public
156 + * License along with this library; if not, write to the Free Software
157 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
158 + * MA 02111-1307 USA
161 + * Sun Industry Standards Source License Version 1.1
162 + * =================================================
163 + * The contents of this file are subject to the Sun Industry Standards
164 + * Source License Version 1.1 (the "License"); You may not use this file
165 + * except in compliance with the License. You may obtain a copy of the
166 + * License at http://www.openoffice.org/license.html.
168 + * Software provided under this License is provided on an "AS IS" basis,
169 + * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
170 + * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
171 + * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
172 + * See the License for the specific provisions governing your rights and
173 + * obligations concerning the Software.
175 + * The Initial Developer of the Original Code is: Sun Microsystems, Inc.
177 + * Copyright: 2000 by Sun Microsystems, Inc.
179 + * All Rights Reserved.
181 + * Contributor(s): _______________________________________
184 + ************************************************************************/
185 +#ifndef _SVX_ZOOMTBXCTRL_HXX
186 +#define _SVX_ZOOMTBXCTRL_HXX
188 +#ifndef _SFXTBXCTRL_HXX
189 +#include <sfx2/tbxctrl.hxx>
192 +class SvxZoomToolBoxControl : public SfxToolBoxControl
195 + SFX_DECL_TOOLBOX_CONTROL();
197 + SvxZoomToolBoxControl( USHORT nId, ToolBox& rTbx, SfxBindings& rBindings );
198 + ~SvxZoomToolBoxControl();
200 + virtual void StateChanged( USHORT nSID,
201 + SfxItemState eState,
202 + const SfxPoolItem* pState );
204 + virtual Window* CreateItemWindow( Window *pParent );
207 +#endif // _SVX_ZOOMTBXCTRL_HXX
209 --- /dev/null 2003-02-11 15:36:20.000000000 +0100
210 +++ svx/source/tbxctrls/zoomtbxctrl.cxx 2003-08-17 18:27:29.000000000 +0200
212 +/*************************************************************************
218 + * last change: $Author$ $Date$
220 + * The Contents of this file are made available subject to the terms of
221 + * either of the following licenses
223 + * - GNU Lesser General Public License Version 2.1
224 + * - Sun Industry Standards Source License Version 1.1
226 + * Sun Microsystems Inc., October, 2000
228 + * GNU Lesser General Public License Version 2.1
229 + * =============================================
230 + * Copyright 2000 by Sun Microsystems, Inc.
231 + * 901 San Antonio Road, Palo Alto, CA 94303, USA
233 + * This library is free software; you can redistribute it and/or
234 + * modify it under the terms of the GNU Lesser General Public
235 + * License version 2.1, as published by the Free Software Foundation.
237 + * This library is distributed in the hope that it will be useful,
238 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
239 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
240 + * Lesser General Public License for more details.
242 + * You should have received a copy of the GNU Lesser General Public
243 + * License along with this library; if not, write to the Free Software
244 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
245 + * MA 02111-1307 USA
248 + * Sun Industry Standards Source License Version 1.1
249 + * =================================================
250 + * The contents of this file are subject to the Sun Industry Standards
251 + * Source License Version 1.1 (the "License"); You may not use this file
252 + * except in compliance with the License. You may obtain a copy of the
253 + * License at http://www.openoffice.org/license.html.
255 + * Software provided under this License is provided on an "AS IS" basis,
256 + * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
257 + * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
258 + * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
259 + * See the License for the specific provisions governing your rights and
260 + * obligations concerning the Software.
262 + * The Initial Developer of the Original Code is: Sun Microsystems, Inc.
264 + * Copyright: 2000 by Sun Microsystems, Inc.
266 + * All Rights Reserved.
268 + * Contributor(s): _______________________________________
271 + ************************************************************************/
273 +#include <string> // HACK: prevent conflict between STLPORT and Workshop headers
275 +#ifndef _SV_TOOLBOX_HXX
276 +#include <vcl/toolbox.hxx>
279 +#include <sfx2/app.hxx>
281 +#ifndef _SFXDISPATCH_HXX
282 +#include <sfx2/dispatch.hxx>
284 +#ifndef _SFXVIEWSH_HXX
285 +#include <sfx2/viewsh.hxx>
287 +#ifndef _SV_COMBOBOX_HXX
288 +#include <vcl/combobox.hxx>
291 +#include "dialogs.hrc"
293 +#include "zoomtbxctrl.hxx"
294 +#include "zoomitem.hxx"
295 +#include "dialmgr.hxx"
300 +SFX_IMPL_TOOLBOX_CONTROL( SvxZoomToolBoxControl, SvxZoomItem);
302 +class SvxZoomBox_Impl : public ComboBox
305 + SfxBindings& rBindings;
308 + SvxZoomBox_Impl( Window* pParent, USHORT nSlot, SfxBindings& rBind );
309 + ~SvxZoomBox_Impl();
312 + virtual void Select();
313 + virtual long Notify( NotifyEvent& rNEvt );
315 + void ReleaseFocus();
319 +SvxZoomBox_Impl::SvxZoomBox_Impl( Window* pParent, USHORT nSlot, SfxBindings& rBind ):
320 + ComboBox(pParent, SVX_RES(RID_SVXTBX_ZOOM)),
325 + EnableAutocomplete( FALSE );
326 + USHORT aZoomValues[] =
327 + { 25, 50, 75, 100, 150, 200 };
328 + for(USHORT i = 0; i < sizeof(aZoomValues)/sizeof(USHORT); i++)
330 + String sEntry = String::CreateFromInt32(aZoomValues[i]);
332 + InsertEntry(sEntry);
336 +SvxZoomBox_Impl::~SvxZoomBox_Impl()
339 +void SvxZoomBox_Impl::Select()
341 + if ( !IsTravelSelect() )
343 + String sEntry( GetText() );
344 + sEntry.EraseAllChars( '%' );
345 + USHORT nZoom = (USHORT)sEntry.ToInt32();
347 + if( nZoom < MINZOOM )
349 + if( nZoom > MAXZOOM )
352 + SvxZoomItem aItem( SVX_ZOOM_PERCENT, nZoom, nSlotId );
353 + rBindings.GetDispatcher()->Execute(
354 + nSlotId, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L );
360 +long SvxZoomBox_Impl::Notify( NotifyEvent& rNEvt )
364 + if ( rNEvt.GetType() == EVENT_KEYINPUT )
366 + USHORT nCode = rNEvt.GetKeyEvent()->GetKeyCode().GetCode();
373 + if ( KEY_TAB == nCode )
382 + SetText( GetSavedValue() );
387 + else if ( EVENT_LOSEFOCUS == rNEvt.GetType() )
389 + Window* pFocusWin = Application::GetFocusWindow();
390 + if ( !HasFocus() && GetSubEdit() != pFocusWin )
391 + SetText( GetSavedValue() );
394 + return nHandled ? nHandled : ComboBox::Notify( rNEvt );
397 +void SvxZoomBox_Impl::ReleaseFocus()
404 + SfxViewShell* pCurSh = SfxViewShell::Current();
408 + Window* pShellWnd = pCurSh->GetWindow();
411 + pShellWnd->GrabFocus();
415 +SvxZoomToolBoxControl::SvxZoomToolBoxControl( USHORT nId,
417 + SfxBindings& rBind ) :
418 + SfxToolBoxControl( nId, rTbx, rBind )
422 +SvxZoomToolBoxControl::~SvxZoomToolBoxControl()
426 +void SvxZoomToolBoxControl::StateChanged( USHORT nSID,
427 + SfxItemState eState,
428 + const SfxPoolItem* pState )
430 + USHORT nId = GetId();
431 + GetToolBox().EnableItem( nId, (GetItemState( pState ) != SFX_ITEM_DISABLED) );
432 + SvxZoomBox_Impl* pBox = (SvxZoomBox_Impl*)GetToolBox().GetItemWindow( GetId() );
434 + if( SFX_ITEM_AVAILABLE <= eState )
436 + String sZoom( String::CreateFromInt32( ((const SfxUInt16Item*)pState)->GetValue() ) );
438 + pBox->SetText( sZoom );
443 +Window* SvxZoomToolBoxControl::CreateItemWindow( Window *pParent )
445 + SvxZoomBox_Impl* pRet = new SvxZoomBox_Impl( pParent, GetId(), GetBindings() );
448 diff -Nur -x CVS -x unxlngi4.pro -x '*.bmp' -x ooo-convert-stamp sw/source/ui/app/swmodule.cxx sw/source/ui/app/swmodule.cxx
449 --- sw/source/ui/app/swmodule.cxx 2003-07-07 18:10:23.000000000 +0200
450 +++ sw/source/ui/app/swmodule.cxx 2003-08-13 22:52:29.000000000 +0200
452 #ifndef _SVX_VERT_TEXT_TBXCTRL_HXX
453 #include <svx/verttexttbxctrl.hxx>
455 +#ifndef _SVX_ZOOMTBXCTRL_HXX
456 +#include <svx/zoomtbxctrl.hxx>
458 #ifndef _CONTDLG_HXX_ //autogen
459 #include <svx/contdlg.hxx>
462 SvxFontSizeMenuControl::RegisterControl(SID_ATTR_CHAR_FONTHEIGHT, pMod );
464 SwZoomControl::RegisterControl(SID_ATTR_ZOOM, pMod );
465 + SvxZoomToolBoxControl::RegisterControl(SID_ATTR_ZOOM, pMod);
466 SwPreviewZoomControl::RegisterControl(FN_PREVIEW_ZOOM, pMod);
467 SwHyperlinkControl::RegisterControl(FN_STAT_HYPERLINKS, pMod );
468 SvxPosSizeStatusBarControl::RegisterControl(0, pMod );
470 Index: sw/source/ui/uiview/pview.src
471 ===================================================================
472 RCS file: /cvs/sw/sw/source/ui/uiview/pview.src,v
473 retrieving revision 1.28
474 diff -u -r1.28 pview.src
475 --- sw/source/ui/uiview/pview.src 17 Jul 2003 12:04:56 -0000 1.28
476 +++ sw/source/ui/uiview/pview.src 20 Aug 2003 21:47:00 -0000
477 @@ -1043,11 +1043,6 @@
478 Identifier = SID_ZOOM_IN;
479 HelpID = SID_ZOOM_IN ;
483 - Identifier = FN_PREVIEW_ZOOM;
484 - HelpID = HID_PREVIEW_ZOOM ;
486 ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; };
489 Index: sc/source/ui/app/scdll.cxx
490 ===================================================================
491 RCS file: /cvs/sc/sc/source/ui/app/scdll.cxx,v
492 retrieving revision 1.14
493 diff -u -r1.14 scdll.cxx
494 --- sc/source/ui/app/scdll.cxx 26 Mar 2003 18:05:47 -0000 1.14
495 +++ sc/source/ui/app/scdll.cxx 18 Aug 2003 19:08:47 -0000
497 #include <svx/selctrl.hxx>
498 #include <svx/insctrl.hxx>
499 #include <svx/zoomctrl.hxx>
500 +#include <svx/zoomtbxctrl.hxx>
501 #include <svx/flditem.hxx>
502 #include <svx/modctrl.hxx>
503 #include <svx/pszctrl.hxx>
505 SvxInsertStatusBarControl ::RegisterControl(SID_ATTR_INSERT, pMod);
506 SvxSelectionModeControl ::RegisterControl(SID_STATUS_SELMODE, pMod);
507 SvxZoomStatusBarControl ::RegisterControl(SID_ATTR_ZOOM, pMod);
508 + SvxZoomToolBoxControl ::RegisterControl(SID_ATTR_ZOOM, pMod);
509 SvxModifyControl ::RegisterControl(SID_DOC_MODIFIED, pMod);
510 SvxPosSizeStatusBarControl ::RegisterControl(SID_ATTR_SIZE, pMod);
512 Index: sd/source/ui/app/sddll2.cxx
513 ===================================================================
514 RCS file: /cvs/graphics/sd/source/ui/app/sddll2.cxx,v
515 retrieving revision 1.10
516 diff -u -r1.10 sddll2.cxx
517 --- sd/source/ui/app/sddll2.cxx 13 Sep 2002 13:42:54 -0000 1.10
518 +++ sd/source/ui/app/sddll2.cxx 18 Aug 2003 19:03:03 -0000
520 #ifndef _SVX_ZOOMCTRL_HXX //autogen
521 #include <svx/zoomctrl.hxx>
523 +#ifndef _SVX_ZOOMTBXCTRL_HXX //autogen
524 +#include <svx/zoomtbxctrl.hxx>
526 #ifndef _SVX_PSZCTRL_HXX //autogen
527 #include <svx/pszctrl.hxx>
531 // StatusBarControls registrieren
532 SvxZoomStatusBarControl::RegisterControl( SID_ATTR_ZOOM, pMod );
533 + SvxZoomToolBoxControl::RegisterControl( SID_ATTR_ZOOM, pMod );
534 SvxPosSizeStatusBarControl::RegisterControl( SID_ATTR_SIZE, pMod );
535 SvxModifyControl::RegisterControl( SID_DOC_MODIFIED, pMod );
536 //SvxInsertStatusBarControl::RegisterControl(0, pModd);
537 Index: starmath/source/smdll.cxx
538 ===================================================================
539 RCS file: /cvs/sw/starmath/source/smdll.cxx,v
540 retrieving revision 1.5
541 diff -u -r1.5 smdll.cxx
542 --- starmath/source/smdll.cxx 12 Oct 2001 15:54:37 -0000 1.5
543 +++ starmath/source/smdll.cxx 18 Aug 2003 19:10:56 -0000
545 #ifndef _SVX_ZOOMCTRL_HXX //autogen
546 #include <svx/zoomctrl.hxx>
548 +#ifndef _SVX_ZOOMTBXCTRL_HXX //autogen
549 +#include <svx/zoomtbxctrl.hxx>
551 #ifndef _SFX_OBJFAC_HXX
552 #include <sfx2/docfac.hxx>
555 SmViewShell::RegisterInterface(pp);
557 SvxZoomStatusBarControl::RegisterControl( SID_ATTR_ZOOM, pp );
558 + SvxZoomToolBoxControl::RegisterControl( SID_ATTR_ZOOM, pp );
559 SvxModifyControl::RegisterControl( SID_TEXTSTATUS, pp );
560 SvxUndoRedoControl::RegisterControl( SID_UNDO, pp );
561 SvxUndoRedoControl::RegisterControl( SID_REDO, pp );
562 cvs server: Diffing starmath/util
563 cvs server: Diffing starmath/xml
565 ===================================================================
566 RCS file: /cvs/graphics/svx/prj/d.lst,v
567 retrieving revision 1.74
568 diff -u -3 -p -r1.74 d.lst
569 --- svx/prj/d.lst 29 Apr 2003 16:30:00 -0000 1.74
570 +++ svx/prj/d.lst 19 Aug 2003 15:25:12 -0000
571 @@ -487,6 +487,7 @@ hedabu: ..\inc\xexch.hxx %_DEST%\inc%_EX
572 hedabu: ..\inc\zoom.hxx %_DEST%\inc%_EXT%\svx\zoom.hxx
573 hedabu: ..\inc\zoomctrl.hxx %_DEST%\inc%_EXT%\svx\zoomctrl.hxx
574 hedabu: ..\inc\zoomitem.hxx %_DEST%\inc%_EXT%\svx\zoomitem.hxx
575 +hedabu: ..\inc\zoomtbxctrl.hxx %_DEST%\inc%_EXT%\svx\zoomtbxctrl.hxx
576 hedabu: ..\source\items\boxobj.hxx %_DEST%\inc%_EXT%\svx\boxobj.hxx
577 hedabu: ..\inc\itemtype.hxx %_DEST%\inc%_EXT%\svx\itemtype.hxx
578 hedabu: ..\inc\outliner.hxx %_DEST%\inc%_EXT%\svx\outliner.hxx