diff options
Diffstat (limited to 'svx/source/dialog')
35 files changed, 282 insertions, 1520 deletions
diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx index 581c12712c..20e59b4d3d 100644 --- a/svx/source/dialog/_bmpmask.cxx +++ b/svx/source/dialog/_bmpmask.cxx @@ -34,7 +34,7 @@ #include <tools/shl.hxx> #include <vcl/metaact.hxx> #include <svtools/valueset.hxx> -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <sfx2/dispatch.hxx> #include <svtools/colrdlg.hxx> diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx index 92c03de1d6..157d7e8053 100644 --- a/svx/source/dialog/_contdlg.cxx +++ b/svx/source/dialog/_contdlg.cxx @@ -35,7 +35,7 @@ #include <tools/shl.hxx> #include <vcl/salbtype.hxx> // FRound #include <vcl/msgbox.hxx> -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/viewfrm.hxx> #include <svtools/miscopt.hxx> @@ -421,7 +421,7 @@ SvxSuperContourDlg::SvxSuperContourDlg( SfxBindings *_pBindings, SfxChildWindow Point aPos( aTbx1.GetPosPixel() ); SvtMiscOptions aMiscOptions; - aMiscOptions.AddListener( LINK( this, SvxSuperContourDlg, MiscHdl ) ); + aMiscOptions.AddListenerLink( LINK( this, SvxSuperContourDlg, MiscHdl ) ); aTbx1.SetOutStyle( aMiscOptions.GetToolboxStyle() ); aTbx1.SetSizePixel( aTbxSize ); diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx index 7258c2ca4a..f0827a25e7 100644 --- a/svx/source/dialog/charmap.cxx +++ b/svx/source/dialog/charmap.cxx @@ -53,7 +53,7 @@ #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <com/sun/star/accessibility/AccessibleStateType.hpp> #include <comphelper/types.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include "rtl/ustrbuf.hxx" diff --git a/svx/source/dialog/databaseregistrationui.cxx b/svx/source/dialog/databaseregistrationui.cxx index 84f5debf8c..9406c09672 100644 --- a/svx/source/dialog/databaseregistrationui.cxx +++ b/svx/source/dialog/databaseregistrationui.cxx @@ -47,7 +47,7 @@ // === includes (global) ================================================= #include <sfx2/app.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <vcl/msgbox.hxx> // === /includes (global) ================================================ diff --git a/svx/source/dialog/dialmgr.cxx b/svx/source/dialog/dialmgr.cxx index becd5ad806..0a05a75b3d 100644 --- a/svx/source/dialog/dialmgr.cxx +++ b/svx/source/dialog/dialmgr.cxx @@ -39,7 +39,7 @@ #include <svx/dialmgr.hxx> #include <tools/rc.hxx> -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #include <vcl/svapp.hxx> static ResMgr* pResMgr=0; diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx index fe75592b6e..79d0490720 100644 --- a/svx/source/dialog/dlgctl3d.cxx +++ b/svx/source/dialog/dlgctl3d.cxx @@ -35,7 +35,7 @@ #include <svx/dialogs.hrc> #include <svx/view3d.hxx> #include <svx/fmmodel.hxx> -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #include <svx/fmpage.hxx> #include <svx/polysc3d.hxx> #include <svx/sphere3d.hxx> diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx index a0d401eb4f..21941e26fa 100644 --- a/svx/source/dialog/dlgctrl.cxx +++ b/svx/source/dialog/dlgctrl.cxx @@ -60,6 +60,7 @@ #include <svx/svdopath.hxx> #include <svx/sdr/contact/objectcontactofobjlistpainter.hxx> #include <svx/sdr/contact/displayinfo.hxx> +#include "linectrl.hrc" #define OUTPUT_DRAWMODE_COLOR (DRAWMODE_DEFAULT) #define OUTPUT_DRAWMODE_CONTRAST (DRAWMODE_SETTINGSLINE | DRAWMODE_SETTINGSFILL | DRAWMODE_SETTINGSTEXT | DRAWMODE_SETTINGSGRADIENT) @@ -1774,6 +1775,30 @@ void LineLB::Fill( const XDashList* pList ) SetUpdateMode( TRUE ); } +void LineLB::FillStyles() +{ + ResMgr& rMgr = DIALOG_MGR(); + + // Linienstile + Clear(); + InsertEntry( String( ResId( RID_SVXSTR_INVISIBLE, rMgr ) ) ); + + const StyleSettings& rStyles = Application::GetSettings().GetStyleSettings(); + Bitmap aBitmap ( SVX_RES ( RID_SVXCTRL_LINECTRL ) ); + Color aSourceColors[2]; + Color aDestColors[2]; + + aSourceColors[0] = Color( COL_WHITE ); + aSourceColors[1] = Color( COL_BLACK ); + + aDestColors[0] = rStyles.GetFieldColor(); + aDestColors[1] = rStyles.GetFieldTextColor(); + + aBitmap.Replace ( aSourceColors, aDestColors, 2 ); + Image aSolidLine ( aBitmap ); + InsertEntry( String( ResId( RID_SVXSTR_SOLID, rMgr ) ), aSolidLine ); +} + /************************************************************************/ void LineLB::Append( XDashEntry* pEntry, Bitmap* pBmp ) diff --git a/svx/source/dialog/dlgutil.cxx b/svx/source/dialog/dlgutil.cxx index 57e9296dbe..a1fd1e8bbd 100644 --- a/svx/source/dialog/dlgutil.cxx +++ b/svx/source/dialog/dlgutil.cxx @@ -39,7 +39,7 @@ #include <unolingu.hxx> #include <svtools/langtab.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/objsh.hxx> diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index ea7ff7479a..5533100319 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -65,7 +65,7 @@ #include <osl/file.hxx> #include <osl/security.hxx> #include <rtl/bootstrap.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <unotools/localfilehelper.hxx> #define RET_BACK 100 diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx index d76dd9a4a2..8e016995a0 100644 --- a/svx/source/dialog/fntctrl.cxx +++ b/svx/source/dialog/fntctrl.cxx @@ -50,7 +50,7 @@ #define _SVSTDARR_USHORTS #define _SVSTDARR_ULONGS #define _SVSTDARR_XUB_STRLEN -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #endif #include <svtools/colorcfg.hxx> diff --git a/svx/source/dialog/frmdirlbox.src b/svx/source/dialog/frmdirlbox.src deleted file mode 100644 index f9d5d4bedf..0000000000 --- a/svx/source/dialog/frmdirlbox.src +++ /dev/null @@ -1,96 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: frmdirlbox.src,v $ - * $Revision: 1.14 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org 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 version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include <svx/dialogs.hrc> - -// frame direction ------------------------------------------------------------ - -String RID_SVXSTR_FRAMEDIR_LTR -{ - Text [ en-US ] = "Left-to-right"; -}; - -String RID_SVXSTR_FRAMEDIR_RTL -{ - Text [ en-US ] = "Right-to-left"; -}; - -String RID_SVXSTR_FRAMEDIR_SUPER -{ - Text [ en-US ] = "Use superordinate object settings"; -}; - -// page direction ------------------------------------------------------------- - -String RID_SVXSTR_PAGEDIR_LTR_HORI -{ - Text [ en-US ] = "Left-to-right (horizontal)"; -}; - -String RID_SVXSTR_PAGEDIR_RTL_HORI -{ - Text [ en-US ] = "Right-to-left (horizontal)"; -}; - -String RID_SVXSTR_PAGEDIR_RTL_VERT -{ - Text [ en-US ] = "Right-to-left (vertical)"; -}; - -String RID_SVXSTR_PAGEDIR_LTR_VERT -{ - Text [ en-US ] = "Left-to-right (vertical)"; -}; - -// ---------------------------------------------------------------------------- - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx index f83c7608ac..f1174bde5c 100644 --- a/svx/source/dialog/graphctl.cxx +++ b/svx/source/dialog/graphctl.cxx @@ -30,10 +30,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #include <vcl/dialog.hxx> #include <vcl/wrkwin.hxx> -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> #include <rtl/math.hxx> #include <unotools/localedatawrapper.hxx> #ifndef _UNOTOOLS_PROCESSFACTORY_HXX diff --git a/svx/source/dialog/grfflt.cxx b/svx/source/dialog/grfflt.cxx index 583de9a93e..f2b0a18439 100644 --- a/svx/source/dialog/grfflt.cxx +++ b/svx/source/dialog/grfflt.cxx @@ -194,7 +194,7 @@ ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& r SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) { - AbstractGraphicFilterDialog* aDlg = pFact->CreateGraphicFilterMosaic( pWindow, rGraphic, 4, 4, FALSE, RID_SVX_GRFFILTER_DLG_MOSAIC ); + AbstractGraphicFilterDialog* aDlg = pFact->CreateGraphicFilterMosaic( pWindow, rGraphic, 4, 4, FALSE, RID_SVX_GRFFILTER_DLG_MOSAIC); DBG_ASSERT(aDlg, "Dialogdiet fail!");//CHINA001 if( aDlg->Execute() == RET_OK ) //CHINA001 if( aDlg.Execute() == RET_OK ) aGraphic = aDlg->GetFilteredGraphic( rGraphic, 1.0, 1.0 ); //CHINA001 aGraphic = aDlg.GetFilteredGraphic( rGraphic, 1.0, 1.0 ); diff --git a/svx/source/dialog/hangulhanja.cxx b/svx/source/dialog/hangulhanja.cxx index cb7ef22f73..9f56848d8e 100644 --- a/svx/source/dialog/hangulhanja.cxx +++ b/svx/source/dialog/hangulhanja.cxx @@ -34,8 +34,8 @@ #include <vcl/msgbox.hxx> //add CHINA001 #include <vcl/button.hxx> // header for class SvtLinguConfig -#include <svtools/lingucfg.hxx> -#include <svtools/linguprops.hxx> +#include <unotools/lingucfg.hxx> +#include <unotools/linguprops.hxx> #include <set> #include <map> @@ -347,7 +347,7 @@ namespace svx SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) { - m_pConversionDialog = pFact->CreateHangulHanjaConversionDialog(m_pUIParent, m_ePrimaryConversionDirection, RID_SVX_MDLG_HANGULHANJA); + m_pConversionDialog = pFact->CreateHangulHanjaConversionDialog(m_pUIParent, m_ePrimaryConversionDirection ); DBG_ASSERT(m_pConversionDialog, "Dialogdiet fail!");//CHINA001 m_pConversionDialog->EnableRubySupport( m_pAntiImpl->HasRubySupport() ); diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx index 9ba5238dea..85db5fca3e 100644 --- a/svx/source/dialog/hdft.cxx +++ b/svx/source/dialog/hdft.cxx @@ -33,7 +33,7 @@ // include --------------------------------------------------------------- #include <tools/shl.hxx> -#include <svtools/itemiter.hxx> +#include <svl/itemiter.hxx> #include <sfx2/app.hxx> #include <sfx2/objsh.hxx> #include <sfx2/module.hxx> @@ -560,7 +560,7 @@ IMPL_LINK( SvxHFPage, BackgroundHdl, Button *, EMPTYARG ) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) { - SfxAbstractTabDialog* pDlg = pFact->CreateSvxBorderBackgroundDlg( this, *pBBSet, RID_SVXDLG_BBDLG,bEnableBackgroundSelector ); + SfxAbstractTabDialog* pDlg = pFact->CreateSvxBorderBackgroundDlg( this, *pBBSet, bEnableBackgroundSelector ); DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 if ( pDlg->Execute() == RET_OK && pDlg->GetOutputItemSet() ) { diff --git a/svx/source/dialog/hyperdlg.cxx b/svx/source/dialog/hyperdlg.cxx index efbe2e850b..edb6d73b95 100644 --- a/svx/source/dialog/hyperdlg.cxx +++ b/svx/source/dialog/hyperdlg.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,13 +33,11 @@ // include --------------------------------------------------------------- #include <vcl/settings.hxx> -#include <svtools/viewoptions.hxx> +#include <unotools/viewoptions.hxx> #include "hyperdlg.hxx" #include <svx/svxdlg.hxx> //CHINA001 #include <sfx2/app.hxx> #include <sfx2/sfxsids.hrc> -#include "hyperdlg.hrc" - //######################################################################## //# # diff --git a/svx/source/dialog/hyperdlg.src b/svx/source/dialog/hyperdlg.src deleted file mode 100644 index 780488347c..0000000000 --- a/svx/source/dialog/hyperdlg.src +++ /dev/null @@ -1,971 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: hyperdlg.src,v $ - * $Revision: 1.78 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org 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 version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include <svtools/controldims.hrc> -#include <svx/dialogs.hrc> -#include "helpid.hrc" -#include "hyperdlg.hrc" - -#define MASKCOLOR MaskColor = Color { Red=0xFFFF; Green=0x0000; Blue=0xFFFF; }; -#define HYPERDLG_IMGBUTTON_HEIGHT RSC_CD_PUSHBUTTON_HEIGHT+2 - -/************************************************************************* -| -| Tabpage : Internet -| -*************************************************************************/ - -TabPage RID_SVXPAGE_HYPERLINK_INTERNET -{ - Hide = TRUE ; - HelpID = HID_HYPERLINK_INTERNET; - OutputSize = TRUE ; - SVLook = TRUE ; - Size = MAP_APPFONT ( 260 , 162 ) ; - Text [ en-US ] = "Hyperlink" ; - - FixedLine GRP_LINKTYPE - { - Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 248 , 8 ) ; - Text [ en-US ] = "Hyperlink type" ; - }; - RadioButton RB_LINKTYP_INTERNET - { - Pos = MAP_APPFONT( COL_2, 13 ); - Size = MAP_APPFONT( 57, 10 ); - Text [ en-US ] = "~Web"; - }; - RadioButton RB_LINKTYP_FTP - { - Pos = MAP_APPFONT( 114 + COL_DIFF, 13 ); - Size = MAP_APPFONT( 56 - COL_DIFF, 10 ); - Text [ en-US ] = "~FTP"; - }; - RadioButton RB_LINKTYP_TELNET - { - Pos = MAP_APPFONT( 173, 13 ); - Size = MAP_APPFONT( 56, 10 ); - Text [ en-US ] = "~Telnet"; - }; - FixedText FT_TARGET_HTML - { - Pos = MAP_APPFONT ( 12 , 26 ) ; - Size = MAP_APPFONT ( 39 + COL_DIFF, 8 ) ; - Text [ en-US ] = "Tar~get" ; - }; - FixedText FT_LOGIN - { - Pos = MAP_APPFONT ( 12 , 43 ) ; - Size = MAP_APPFONT ( 39 + COL_DIFF , 8 ) ; - Text [ en-US ] = "~Login name" ; - }; - Edit ED_LOGIN - { - Border = TRUE ; - Pos = MAP_APPFONT ( COL_2 , 42 ) ; - Size = MAP_APPFONT ( 80 - COL_DIFF , 12 ) ; - }; - FixedText FT_PASSWD - { - Pos = MAP_APPFONT ( 12 , 60 ) ; - Size = MAP_APPFONT ( 39 + COL_DIFF , 8 ) ; - Text [ en-US ] = "~Password" ; - }; - Edit ED_PASSWD - { - Border = TRUE ; - Pos = MAP_APPFONT ( COL_2 , 59 ) ; - Size = MAP_APPFONT ( 80 - COL_DIFF , 12 ) ; - PassWord = TRUE ; - }; - CheckBox CBX_ANONYMOUS - { - Pos = MAP_APPFONT ( COL_2 , 75 ) ; - Size = MAP_APPFONT ( 89 - COL_DIFF , 10 ) ; - TabStop = TRUE ; - Text [ en-US ] = "Anonymous ~user" ; - }; - ImageButton BTN_BROWSE - { - Pos = MAP_APPFONT ( 235, 24 ) ; - Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_HEIGHT, HYPERDLG_IMGBUTTON_HEIGHT ); - TabStop = TRUE ; - Text [ en-US ] = "WWW Browser"; - - QuickHelpText [ en-US ] = "WWW Browser" ; - ButtonImage = Image - { - ImageBitmap = Bitmap { File = "browse.bmp" ; }; - MASKCOLOR - }; - }; - Image IMG_BROWSE_HC - { - ImageBitmap = Bitmap { File = "browse_hc.bmp" ; }; - MASKCOLOR - }; - ImageButton BTN_TARGET - { - Pos = MAP_APPFONT ( 235, 40+2 ) ; - Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_HEIGHT, HYPERDLG_IMGBUTTON_HEIGHT ); - TabStop = TRUE ; - Text [ en-US ] = "Target in Document"; - - QuickHelpText [ en-US ] = "Target in Document" ; - ButtonImage = Image - { - ImageBitmap = Bitmap { File = "target.bmp" ; }; - MASKCOLOR - }; - }; - Image IMG_TARGET_HC - { - ImageBitmap = Bitmap { File = "target_hc.bmp" ; }; - MASKCOLOR - }; - FixedLine GRP_MORE - { - Pos = MAP_APPFONT ( 6 , 92 ) ; - Size = MAP_APPFONT ( 248 , 8 ) ; - Text [ en-US ] = "Further settings" ; - }; - FixedText FT_FRAME - { - Pos = MAP_APPFONT ( 12 , 105 ) ; - Size = MAP_APPFONT ( 39 + COL_DIFF , 8 ) ; - Text [ en-US ] = "F~rame" ; - }; - ComboBox CB_FRAME - { - Border = TRUE ; - Pos = MAP_APPFONT ( COL_2 , 104 ) ; - Size = MAP_APPFONT ( 66 - COL_DIFF , 60 ) ; - TabStop = TRUE ; - DropDown = TRUE ; - Sort = TRUE ; - }; - FixedText FT_FORM - { - Pos = MAP_APPFONT ( 126 , 105 ) ; - Size = MAP_APPFONT ( 33 , 8 ) ; - Text [ en-US ] = "F~orm" ; - }; - ListBox LB_FORM - { - Border = TRUE ; - Pos = MAP_APPFONT ( 160 , 104 ) ; - Size = MAP_APPFONT ( 70 , 60 ) ; - TabStop = TRUE ; - DropDown = TRUE ; - AutoHScroll = TRUE ; - DDExtraWidth = TRUE ; - StringList [ en-US ] = - { - < "Text" ; Default ; > ; - < "Button" ; Default ; > ; - }; - }; - FixedText FT_INDICATION - { - Pos = MAP_APPFONT ( 12 , 123 ) ; - Size = MAP_APPFONT ( 39 + COL_DIFF , 8 ) ; - Text [ en-US ] = "Te~xt" ; - }; - Edit ED_INDICATION - { - Border = TRUE ; - Pos = MAP_APPFONT ( COL_2 , 122 ) ; - Size = MAP_APPFONT ( 194 - COL_DIFF , 12 ) ; - }; - FixedText FT_TEXT - { - Pos = MAP_APPFONT ( 12 , 140 ) ; - Size = MAP_APPFONT ( 39 + COL_DIFF , 8 ) ; - Text [ en-US ] = "N~ame" ; - }; - Edit ED_TEXT - { - Border = TRUE ; - Pos = MAP_APPFONT ( COL_2 , 139 ) ; - Size = MAP_APPFONT ( 194 - COL_DIFF , 12 ) ; - }; - ImageButton BTN_SCRIPT - { - Pos = MAP_APPFONT ( 235, 103-1 ) ; - Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_HEIGHT, HYPERDLG_IMGBUTTON_HEIGHT ); - TabStop = TRUE ; - - QuickHelpText [ en-US ] = "Events" ; - ButtonImage = Image - { - ImageBitmap = Bitmap { File = "script.bmp" ; }; - MASKCOLOR - }; - Text [ en-US ] = "Events"; - }; - Image IMG_SCRIPT_HC - { - ImageBitmap = Bitmap { File = "script_hc.bmp" ; }; - MASKCOLOR - }; -}; - -/************************************************************************* -| -| Tabpage : Mail & News -| -*************************************************************************/ - -TabPage RID_SVXPAGE_HYPERLINK_MAIL -{ - Hide = TRUE ; - HelpID = HID_HYPERLINK_MAIL; - OutputSize = TRUE ; - SVLook = TRUE ; - Size = MAP_APPFONT ( 260 , 162 ) ; - Text [ en-US ] = "Hyperlink" ; - - FixedLine GRP_MAILNEWS - { - Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 248 , 8 ) ; - Text [ en-US ] = "Mail & news" ; - }; - RadioButton RB_LINKTYP_MAIL - { - Pos = MAP_APPFONT( COL_2, 13 ); - Size = MAP_APPFONT( 56 - COL_DIFF, 10 ); - Text [ en-US ] = "~E-mail"; - }; - RadioButton RB_LINKTYP_NEWS - { - Pos = MAP_APPFONT( 113, 13 ); - Size = MAP_APPFONT( 56, 10 ); - Text [ en-US ] = "~News"; - }; - FixedText FT_RECEIVER - { - Pos = MAP_APPFONT ( 12 , 26 ) ; - Size = MAP_APPFONT ( 39 + COL_DIFF , 8 ) ; - Text [ en-US ] = "Re~ceiver" ; - }; - FixedText FT_SUBJECT - { - Pos = MAP_APPFONT ( 12 , 43 ) ; - Size = MAP_APPFONT ( 39 + COL_DIFF , 8 ) ; - Text [ en-US ] = "~Subject" ; - }; - Edit ED_SUBJECT - { - Border = TRUE ; - Pos = MAP_APPFONT ( COL_2 , 42 ) ; - Size = MAP_APPFONT ( 176 - COL_DIFF , 12 ) ; - }; - ImageButton BTN_ADRESSBOOK - { - Pos = MAP_APPFONT ( 235, 24 ) ; - Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_HEIGHT, HYPERDLG_IMGBUTTON_HEIGHT ); - TabStop = TRUE ; - - ButtonImage = Image - { - ImageBitmap = Bitmap { File = "adrbook.bmp" ; }; - MASKCOLOR - }; - - Text [ en-US ] = "Data Sources..."; - QuickHelpText [ en-US ] = "Data Sources..." ; - }; - Image IMG_ADRESSBOOK_HC - { - ImageBitmap = Bitmap { File = "adrbook_hc.bmp" ; }; - MASKCOLOR - }; - - FixedLine GRP_MORE - { - Pos = MAP_APPFONT ( 6 , 92 ) ; - Size = MAP_APPFONT ( 248 , 8 ) ; - Text [ en-US ] = "Further settings" ; - }; - FixedText FT_FRAME - { - Pos = MAP_APPFONT ( 12 , 105 ) ; - Size = MAP_APPFONT ( 39 + COL_DIFF , 8 ) ; - Text [ en-US ] = "F~rame" ; - }; - ComboBox CB_FRAME - { - Border = TRUE ; - Pos = MAP_APPFONT ( COL_2 , 104 ) ; - Size = MAP_APPFONT ( 66 - COL_DIFF , 60 ) ; - TabStop = TRUE ; - DropDown = TRUE ; - Sort = TRUE ; - }; - FixedText FT_FORM - { - Pos = MAP_APPFONT ( 126 , 105 ) ; - Size = MAP_APPFONT ( 33 , 10 ) ; - Text [ en-US ] = "F~orm" ; - }; - ListBox LB_FORM - { - Border = TRUE ; - Pos = MAP_APPFONT ( 160 , 104 ) ; - Size = MAP_APPFONT ( 70 , 60 ) ; - TabStop = TRUE ; - DropDown = TRUE ; - AutoHScroll = TRUE ; - DDExtraWidth = TRUE ; - StringList [ en-US ] = - { - < "Text" ; Default ; > ; - < "Button" ; Default ; > ; - }; - }; - FixedText FT_INDICATION - { - Pos = MAP_APPFONT ( 12 , 123 ) ; - Size = MAP_APPFONT ( 39 + COL_DIFF , 8 ) ; - Text [ en-US ] = "Te~xt" ; - }; - Edit ED_INDICATION - { - Border = TRUE ; - Pos = MAP_APPFONT ( COL_2 , 122 ) ; - Size = MAP_APPFONT ( 194 - COL_DIFF , 12 ) ; - }; - FixedText FT_TEXT - { - Pos = MAP_APPFONT ( 12 , 140 ) ; - Size = MAP_APPFONT ( 39 + COL_DIFF , 8 ) ; - Text [ en-US ] = "N~ame" ; - }; - Edit ED_TEXT - { - Border = TRUE ; - Pos = MAP_APPFONT ( COL_2 , 139 ) ; - Size = MAP_APPFONT ( 194 - COL_DIFF , 12 ) ; - }; - ImageButton BTN_SCRIPT - { - Pos = MAP_APPFONT ( 235, 103-1 ) ; - Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_HEIGHT, HYPERDLG_IMGBUTTON_HEIGHT ); - TabStop = TRUE ; - QuickHelpText [ en-US ] = "Events" ; - ButtonImage = Image - { - ImageBitmap = Bitmap { File = "script.bmp" ; }; - MASKCOLOR - }; - Text [ en-US ] = "Events"; - }; - Image IMG_SCRIPT_HC - { - ImageBitmap = Bitmap { File = "script_hc.bmp" ; }; - MASKCOLOR - }; -}; - -/************************************************************************* -| -| Tabpage : Documents -| -*************************************************************************/ - -TabPage RID_SVXPAGE_HYPERLINK_DOCUMENT -{ - Hide = TRUE ; - HelpID = HID_HYPERLINK_DOCUMENT; - OutputSize = TRUE ; - SVLook = TRUE ; - Size = MAP_APPFONT ( 260 , 162 ) ; - Text [ en-US ] = "Hyperlink" ; - - FixedLine GRP_DOCUMENT - { - Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 248 , 8 ) ; - Text [ en-US ] = "Document" ; - }; - FixedText FT_PATH_DOC - { - Pos = MAP_APPFONT ( 12 , 16 ) ; - Size = MAP_APPFONT ( 39 + COL_DIFF , 8 ) ; - Text [ en-US ] = "~Path" ; - }; - ImageButton BTN_FILEOPEN - { - Pos = MAP_APPFONT ( 235, 14 ) ; - Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_HEIGHT, HYPERDLG_IMGBUTTON_HEIGHT ); - TabStop = TRUE ; - QuickHelpText [ en-US ] = "Open File" ; - ButtonImage = Image - { - ImageBitmap = Bitmap { File = "fileopen.bmp" ; }; - MASKCOLOR - }; - Text [ en-US ] = "Open File"; - }; - Image IMG_FILEOPEN_HC - { - ImageBitmap = Bitmap { File = "fileopen_hc.bmp" ; }; - MASKCOLOR - }; - - FixedLine GRP_TARGET - { - Pos = MAP_APPFONT ( 6 , 38 ) ; - Size = MAP_APPFONT ( 248 , 8 ) ; - Text [ en-US ] = "Target in document" ; - }; - FixedText FT_TARGET_DOC - { - Pos = MAP_APPFONT ( 12 , 53 ) ; - Size = MAP_APPFONT ( 39 + COL_DIFF , 8 ) ; - Text [ en-US ] = "Targ~et" ; - }; - Edit ED_TARGET_DOC - { - Border = TRUE ; - Pos = MAP_APPFONT ( COL_2 , 52 ) ; - Size = MAP_APPFONT ( 176 - COL_DIFF , 12 ) ; - }; - FixedText FT_URL - { - Pos = MAP_APPFONT ( 12 , 70 ) ; - Size = MAP_APPFONT ( 39 + COL_DIFF , 8 ) ; - Text [ en-US ] = "URL" ; - }; - FixedText FT_FULL_URL - { - Pos = MAP_APPFONT ( COL_2 , 70 ) ; - Size = MAP_APPFONT ( 176 - COL_DIFF , 12 ) ; - Text [ en-US ] = "Test text" ; - }; - ImageButton BTN_BROWSE - { - Pos = MAP_APPFONT ( 235, 51 ) ; - Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_HEIGHT, HYPERDLG_IMGBUTTON_HEIGHT ); - TabStop = TRUE ; - QuickHelpText [ en-US ] = "Target in Document" ; - ButtonImage = Image - { - ImageBitmap = Bitmap { File = "target.bmp" ; }; - MASKCOLOR - }; - Text [ en-US ] = "Target in Document"; - }; - Image IMG_BROWSE_HC - { - ImageBitmap = Bitmap { File = "target_hc.bmp" ; }; - MASKCOLOR - }; - - FixedLine GRP_MORE - { - Pos = MAP_APPFONT ( 6 , 92 ) ; - Size = MAP_APPFONT ( 248 , 8 ) ; - Text [ en-US ] = "Further settings" ; - }; - FixedText FT_FRAME - { - Pos = MAP_APPFONT ( 12 , 105 ) ; - Size = MAP_APPFONT ( 39 + COL_DIFF , 8 ) ; - Text [ en-US ] = "F~rame" ; - }; - ComboBox CB_FRAME - { - Border = TRUE ; - Pos = MAP_APPFONT ( COL_2 , 104 ) ; - Size = MAP_APPFONT ( 66 - COL_DIFF , 60 ) ; - TabStop = TRUE ; - DropDown = TRUE ; - Sort = TRUE ; - }; - FixedText FT_FORM - { - Pos = MAP_APPFONT ( 126 , 105 ) ; - Size = MAP_APPFONT ( 33 , 10 ) ; - Text [ en-US ] = "F~orm" ; - }; - ListBox LB_FORM - { - Border = TRUE ; - Pos = MAP_APPFONT ( 160 , 104 ) ; - Size = MAP_APPFONT ( 70 , 60 ) ; - TabStop = TRUE ; - DropDown = TRUE ; - AutoHScroll = TRUE ; - DDExtraWidth = TRUE ; - StringList [ en-US ] = - { - < "Text" ; Default ; > ; - < "Button" ; Default ; > ; - }; - }; - FixedText FT_INDICATION - { - Pos = MAP_APPFONT ( 12 , 123 ) ; - Size = MAP_APPFONT ( 39 + COL_DIFF , 8 ) ; - Text [ en-US ] = "Te~xt" ; - }; - Edit ED_INDICATION - { - Border = TRUE ; - Pos = MAP_APPFONT ( COL_2 , 122 ) ; - Size = MAP_APPFONT ( 194 - COL_DIFF , 12 ) ; - }; - FixedText FT_TEXT - { - Pos = MAP_APPFONT ( 12 , 140 ) ; - Size = MAP_APPFONT ( 39 + COL_DIFF , 8 ) ; - Text [ en-US ] = "N~ame" ; - }; - Edit ED_TEXT - { - Border = TRUE ; - Pos = MAP_APPFONT ( COL_2 , 139 ) ; - Size = MAP_APPFONT ( 194 - COL_DIFF , 12 ) ; - }; - ImageButton BTN_SCRIPT - { - Pos = MAP_APPFONT ( 235, 103-1 ) ; - Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_HEIGHT, HYPERDLG_IMGBUTTON_HEIGHT ); - TabStop = TRUE ; - QuickHelpText [ en-US ] = "Events" ; - ButtonImage = Image - { - ImageBitmap = Bitmap { File = "script.bmp" ; }; - MASKCOLOR - }; - Text [ en-US ] = "Events"; - }; - Image IMG_SCRIPT_HC - { - ImageBitmap = Bitmap { File = "script_hc.bmp" ; }; - MASKCOLOR - }; -}; - -/************************************************************************* -| -| Tabpage : New Documents -| -*************************************************************************/ - -TabPage RID_SVXPAGE_HYPERLINK_NEWDOCUMENT -{ - Hide = TRUE ; - HelpID = HID_HYPERLINK_NEWDOCUMENT; - OutputSize = TRUE ; - SVLook = TRUE ; - Size = MAP_APPFONT ( 260 , 162 ) ; - Text [ en-US ] = "Hyperlink" ; - - FixedLine GRP_NEWDOCUMENT - { - Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 248 , 8 ) ; - Text [ en-US ] = "New document" ; - }; - RadioButton RB_EDITNOW - { - Pos = MAP_APPFONT( COL_2, 13 ); - Size = MAP_APPFONT( 85 - COL_DIFF, 10 ); - Text [ en-US ] = "Edit ~now"; - }; - RadioButton RB_EDITLATER - { - Pos = MAP_APPFONT( 142, 13 ); - Size = MAP_APPFONT( 84, 10 ); - Text [ en-US ] = "Edit ~later"; - }; - FixedText FT_PATH_NEWDOC - { - Pos = MAP_APPFONT ( 12 , 26 ) ; - Size = MAP_APPFONT ( 39 + COL_DIFF , 8 ) ; - Text [ en-US ] = "~File" ; - }; - Edit ED_PATH_NEWDOC - { - Border = TRUE ; - Pos = MAP_APPFONT ( COL_2 , 25 ) ; - Size = MAP_APPFONT ( 176 - COL_DIFF , 12 ) ; - }; - FixedText FT_DOCUMENT_TYPES - { - Pos = MAP_APPFONT ( 12 , 43 ) ; - Size = MAP_APPFONT ( 39 + COL_DIFF , 8 ) ; - Text [ en-US ] = "File ~type" ; - }; - ListBox LB_DOCUMENT_TYPES - { - Border = TRUE ; - Pos = MAP_APPFONT ( COL_2 , 42 ) ; - Size = MAP_APPFONT ( 176 - COL_DIFF , 40 ) ; - TabStop = TRUE ; - DropDown = FALSE ; - }; - ImageButton BTN_CREATE - { - Pos = MAP_APPFONT ( 235, 24 ) ; - Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_HEIGHT, HYPERDLG_IMGBUTTON_HEIGHT ); - TabStop = TRUE ; - - QuickHelpText [ en-US ] = "Select Path" ; - ButtonImage = Image - { - ImageBitmap = Bitmap { File = "newdoc.bmp" ; }; - MASKCOLOR - }; - Text [ en-US ] = "Select Path"; - }; - Image IMG_CREATE_HC - { - ImageBitmap = Bitmap { File = "newdoc_hc.bmp" ; }; - MASKCOLOR - }; - - FixedLine GRP_MORE - { - Pos = MAP_APPFONT ( 6 , 92 ) ; - Size = MAP_APPFONT ( 248 , 8 ) ; - Text [ en-US ] = "Further settings" ; - }; - FixedText FT_FRAME - { - Pos = MAP_APPFONT ( 12 , 105 ) ; - Size = MAP_APPFONT ( 39 + COL_DIFF , 8 ) ; - Text [ en-US ] = "F~rame" ; - }; - ComboBox CB_FRAME - { - Border = TRUE ; - Pos = MAP_APPFONT ( COL_2 , 104 ) ; - Size = MAP_APPFONT ( 66 - COL_DIFF , 60 ) ; - TabStop = TRUE ; - DropDown = TRUE ; - Sort = TRUE ; - }; - FixedText FT_FORM - { - Pos = MAP_APPFONT ( 126 , 105 ) ; - Size = MAP_APPFONT ( 33 , 10 ) ; - Text [ en-US ] = "F~orm" ; - }; - ListBox LB_FORM - { - Border = TRUE ; - Pos = MAP_APPFONT ( 160 , 104 ) ; - Size = MAP_APPFONT ( 70 , 60 ) ; - TabStop = TRUE ; - DropDown = TRUE ; - AutoHScroll = TRUE ; - DDExtraWidth = TRUE ; - StringList [ en-US ] = - { - < "Text" ; Default ; > ; - < "Button" ; Default ; > ; - }; - }; - FixedText FT_INDICATION - { - Pos = MAP_APPFONT ( 12 , 123 ) ; - Size = MAP_APPFONT ( 39 + COL_DIFF , 8 ) ; - Text [ en-US ] = "Te~xt" ; - }; - Edit ED_INDICATION - { - Border = TRUE ; - Pos = MAP_APPFONT ( COL_2 , 122 ) ; - Size = MAP_APPFONT ( 194 - COL_DIFF , 12 ) ; - }; - FixedText FT_TEXT - { - Pos = MAP_APPFONT ( 12 , 140 ) ; - Size = MAP_APPFONT ( 39 + COL_DIFF , 8 ) ; - Text [ en-US ] = "N~ame" ; - }; - Edit ED_TEXT - { - Border = TRUE ; - Pos = MAP_APPFONT ( COL_2 , 139 ) ; - Size = MAP_APPFONT ( 194 - COL_DIFF , 12 ) ; - }; - ImageButton BTN_SCRIPT - { - Pos = MAP_APPFONT ( 235, 103-1 ) ; - Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_HEIGHT, HYPERDLG_IMGBUTTON_HEIGHT ); - TabStop = TRUE ; - QuickHelpText [ en-US ] = "Events" ; - ButtonImage = Image - { - ImageBitmap = Bitmap { File = "script.bmp" ; }; - MASKCOLOR - }; - Text [ en-US ] = "Events"; - }; - Image IMG_SCRIPT_HC - { - ImageBitmap = Bitmap { File = "script_hc.bmp" ; }; - MASKCOLOR - }; -}; - -/************************************************************************* -| -| Tabpage-Dialog : Hyperlinks -| -*************************************************************************/ -ModalDialog RID_SVXDLG_NEWHYPERLINK -{ - HelpID = SID_HYPERLINK_DIALOG; - OutputSize = TRUE ; - SVLook = TRUE ; - Size = MAP_APPFONT ( 325 , 185 ) ; - Text [ en-US ] = "Hyperlink" ; - Moveable = TRUE ; -}; - -/************************************************************************* -| -| Tabpage-Dialog : Hyperlinks -| -*************************************************************************/ - -String RID_SVXSTR_HYPDLG_APPLYBUT -{ - Text [ en-US ] = "Apply" ; -}; -String RID_SVXSTR_HYPDLG_CLOSEBUT -{ - Text [ en-US ] = "Close" ; -}; -String RID_SVXSTR_HYPDLG_MACROACT1 -{ - Text [ en-US ] = "Mouse over object" ; -}; -String RID_SVXSTR_HYPDLG_MACROACT2 -{ - Text [ en-US ] = "Trigger hyperlink" ; -}; -String RID_SVXSTR_HYPDLG_MACROACT3 -{ - Text [ en-US ] = "Mouse leaves object" ; -}; - -String RID_SVXSTR_HYPDLG_NOVALIDFILENAME -{ - Text [ en-US ] = "Please type in a valid file name." ; -}; - -String RID_SVXSTR_HYPERDLG_HLINETTP -{ - Text [ en-US ] = "Internet" ; -}; -String RID_SVXSTR_HYPERDLG_HLINETTP_HELP -{ - Text [ en-US ] = "This is where you create a hyperlink to a Web page, FTP server or Telnet connection." ; -}; - -String RID_SVXSTR_HYPERDLG_HLMAILTP -{ - Text [ en-US ] = "Mail & News" ; -}; -String RID_SVXSTR_HYPERDLG_HLMAILTP_HELP -{ - Text [ en-US ] = "This is where you create a hyperlink to an e-mail address or newsgroup." ; -}; - -String RID_SVXSTR_HYPERDLG_HLDOCTP -{ - Text [ en-US ] = "Document" ; -}; -String RID_SVXSTR_HYPERDLG_HLDOCTP_HELP -{ - Text [ en-US ] = "This is where you create a hyperlink to an existing document or a target within a document." ; -}; - -String RID_SVXSTR_HYPERDLG_HLDOCNTP -{ - Text [ en-US ] = "New Document" ; -}; -String RID_SVXSTR_HYPERDLG_HLDOCNTP_HELP -{ - Text [ en-US ] = "This is where you create a new document to which the new link points." ; -}; - -String RID_SVXSTR_HYPERDLG_FORM_BUTTON -{ - Text [ en-US ] = "Button" ; -}; - -String RID_SVXSTR_HYPERDLG_FROM_TEXT -{ - Text [ en-US ] = "Text" ; -}; - -String RID_SVXSTR_HYPERDLG_QUERYOVERWRITE -{ - Text [ en-US ] = "The file already exists. Overwrite?" ; -}; - -Image RID_SVXBMP_HLINETTP -{ - ImageBitmap = Bitmap { File = "hlinettp.bmp" ; }; - MASKCOLOR -}; - -Image RID_SVXBMP_HLMAILTP -{ - ImageBitmap = Bitmap { File = "hlmailtp.bmp" ; }; - MASKCOLOR -}; - -Image RID_SVXBMP_HLDOCTP -{ - ImageBitmap = Bitmap { File = "hldoctp.bmp" ; }; - MASKCOLOR -}; - -Image RID_SVXBMP_HLDOCNTP -{ - ImageBitmap = Bitmap { File = "hldocntp.bmp" ; }; - MASKCOLOR -}; - -Image RID_SVXBMP_HLINETTP_H -{ - ImageBitmap = Bitmap { File = "hlinettp_h.bmp" ; }; - MASKCOLOR -}; - -Image RID_SVXBMP_HLMAILTP_H -{ - ImageBitmap = Bitmap { File = "hlmailtp_h.bmp" ; }; - MASKCOLOR -}; - -Image RID_SVXBMP_HLDOCTP_H -{ - ImageBitmap = Bitmap { File = "hldoctp_h.bmp" ; }; - MASKCOLOR -}; - -Image RID_SVXBMP_HLDOCNTP_H -{ - ImageBitmap = Bitmap { File = "hldocntp_h.bmp" ; }; - MASKCOLOR -}; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/svx/source/dialog/hyprlink.cxx b/svx/source/dialog/hyprlink.cxx index c1be60ebe3..211b2edb22 100644 --- a/svx/source/dialog/hyprlink.cxx +++ b/svx/source/dialog/hyprlink.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,16 +33,16 @@ #include <tools/urlobj.hxx> #include <vcl/msgbox.hxx> #include <unotools/configitem.hxx> -#include <svtools/cmdoptions.hxx> +#include <unotools/cmdoptions.hxx> #include <svtools/inetimg.hxx> -#include <svtools/urlbmk.hxx> -#include <svtools/eitem.hxx> -#include <svtools/stritem.hxx> +#include <svl/urlbmk.hxx> +#include <svl/eitem.hxx> +#include <svl/stritem.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/docfile.hxx> #include <sfx2/imgmgr.hxx> #include <sfx2/dispatch.hxx> -#include <svtools/urihelper.hxx> +#include <svl/urihelper.hxx> #include <sfx2/objsh.hxx> #include <comphelper/processfactory.hxx> @@ -66,13 +66,15 @@ public: ~SearchDefaultConfigItem_Impl(); const OUString& GetDefaultSearchEngine(){ return sDefaultEngine;} + virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); + virtual void Commit(); }; /*-- 11.11.2003 14:20:59--------------------------------------------------- -----------------------------------------------------------------------*/ SearchDefaultConfigItem_Impl::SearchDefaultConfigItem_Impl() : - ConfigItem(OUString::createFromAscii("Inet/DefaultSearchEngine")) + ConfigItem(OUString::createFromAscii("Inet/DefaultSearchEngine")) { uno::Sequence<OUString> aNames(1); aNames.getArray()[0] = OUString::createFromAscii("Name"); @@ -86,6 +88,14 @@ SearchDefaultConfigItem_Impl::~SearchDefaultConfigItem_Impl() { } +void SearchDefaultConfigItem_Impl::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& ) +{ +} + +void SearchDefaultConfigItem_Impl::Commit() +{ +} + /************************************************************************* |* |* Dialog zum Einf"ugen/"Andern eines Hyperlink @@ -119,10 +129,10 @@ SvxHyperlinkDlg::SvxHyperlinkDlg( SfxBindings *_pBindings, Window* pParent) : FreeResource(); mpManager = SfxImageManager::GetImageManager( 0 ); - mpManager->RegisterToolBox( this ); - + mpManager->RegisterToolBox( this ); + SetImages(); - + // save initial size nMaxWidth = GetSizePixel().Width(); nMaxHeight = GetSizePixel().Height(); @@ -188,9 +198,9 @@ SvxHyperlinkDlg::SvxHyperlinkDlg( SfxBindings *_pBindings, Window* pParent) : // Hide button according to config item. SvtCommandOptions aCmdOpts; - if ( aCmdOpts.Lookup( SvtCommandOptions::CMDOPTION_DISABLED, - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( + if ( aCmdOpts.Lookup( SvtCommandOptions::CMDOPTION_DISABLED, + rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM( "InternetSearch" ) ) ) ) HideItem( BTN_INET_SEARCH ); } @@ -202,7 +212,7 @@ SvxHyperlinkDlg::SvxHyperlinkDlg( SfxBindings *_pBindings, Window* pParent) : SvxHyperlinkDlg::~SvxHyperlinkDlg() { SfxImageManager::GetImageManager( 0 )->ReleaseToolBox(this); - + if (pTargetMenu != NULL) delete pTargetMenu; } @@ -419,14 +429,14 @@ IMPL_LINK( SvxHyperlinkDlg, DropdownClick, ToolBox *, pBox ) String sTest(rData.sEngineName); sTest.ToLowerAscii(); bool bIsDefaultEngine = bHasDefault && STRING_NOTFOUND != sTest.Search( sDefault ); - //then put it at the top + //then put it at the top if(i && bIsDefaultEngine) { pMenu->InsertItem( i + 1, rData.sEngineName, 0, 0); pMenu->InsertSeparator(1); - } + } else - { + { if (i) pMenu->InsertSeparator(); pMenu->InsertItem( i + 1, rData.sEngineName); @@ -439,7 +449,7 @@ IMPL_LINK( SvxHyperlinkDlg, DropdownClick, ToolBox *, pBox ) delete pMenu; } break; - + case BTN_TARGET: { // Target Frame einstellen @@ -834,7 +844,7 @@ void SvxHyperlinkDlg::SetImages() SetItemImage( BTN_INSERT_BOOKMARK, mpManager->GetImage( BTN_INSERT_BOOKMARK, bHighContrast ) ); SetItemImage( BTN_INET_SEARCH, mpManager->GetImage( BTN_INET_SEARCH, bHighContrast ) ); SetItemImage( BTN_TARGET, mpManager->GetImage( BTN_TARGET, bHighContrast ) ); - SetItemImage( BTN_OPENDIALOG, mpManager->GetImage( BTN_OPENDIALOG, bHighContrast ) ); + SetItemImage( BTN_OPENDIALOG, mpManager->GetImage( BTN_OPENDIALOG, bHighContrast ) ); } /*-------------------------------------------------------------------- diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx index 23dbaa60ea..db5f21f383 100644 --- a/svx/source/dialog/imapdlg.cxx +++ b/svx/source/dialog/imapdlg.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,13 +52,13 @@ #include <vcl/msgbox.hxx> #include <vcl/group.hxx> #include <vcl/lstbox.hxx> -#include <svtools/eitem.hxx> -#include <svtools/pathoptions.hxx> +#include <svl/eitem.hxx> +#include <unotools/pathoptions.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/module.hxx> #include <sfx2/filedlghelper.hxx> #include "com/sun/star/ui/dialogs/TemplateDescription.hpp" -#include <svtools/urihelper.hxx> +#include <svl/urihelper.hxx> #include <svtools/miscopt.hxx> #include <svtools/ehdl.hxx> #include <svtools/sfxecode.hxx> @@ -196,7 +196,7 @@ void SvxIMapDlgChildWindow::UpdateIMapDlg( const Graphic& rGraphic, const ImageM SvxIMapDlg::SvxIMapDlg( SfxBindings *_pBindings, SfxChildWindow *pCW, Window* _pParent, const ResId& rResId ) : SfxModelessDialog ( _pBindings, pCW, _pParent, rResId ), - + aTbxIMapDlg1 ( this, SVX_RES( TBX_IMAPDLG1 ) ), aFtURL ( this, SVX_RES( FT_URL ) ), maURLBox ( this, SVX_RES( CBB_URL ) ), @@ -230,7 +230,7 @@ SvxIMapDlg::SvxIMapDlg( SfxBindings *_pBindings, SfxChildWindow *pCW, maCbbTarget.SetLoseFocusHdl( LINK( this, SvxIMapDlg, URLLoseFocusHdl ) ); SvtMiscOptions aMiscOptions; - aMiscOptions.AddListener( LINK( this, SvxIMapDlg, MiscHdl ) ); + aMiscOptions.AddListenerLink( LINK( this, SvxIMapDlg, MiscHdl ) ); aTbxIMapDlg1.SetOutStyle( aMiscOptions.GetToolboxStyle() ); aTbxIMapDlg1.SetSizePixel( aTbxIMapDlg1.CalcWindowSizePixel() ); diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx index 85fe1b9057..f57679299c 100644 --- a/svx/source/dialog/imapwnd.cxx +++ b/svx/source/dialog/imapwnd.cxx @@ -38,7 +38,7 @@ #include <svtools/imaprect.hxx> #include <svtools/imapcirc.hxx> #include <svtools/imappoly.hxx> -#include <svtools/urlbmk.hxx> +#include <svl/urlbmk.hxx> #include <xoutbmp.hxx> #include <svx/dialmgr.hxx> @@ -52,7 +52,7 @@ #include <svx/svdopath.hxx> #include <svx/xfltrit.hxx> #include <svx/svdpagv.hxx> -#include <svtools/urihelper.hxx> +#include <svl/urihelper.hxx> #include <svx/xfillit.hxx> #include <svx/xlineit.hxx> #include <sfx2/evntconf.hxx> diff --git a/svx/source/dialog/imapwnd.hxx b/svx/source/dialog/imapwnd.hxx index 31d108dfe0..507b03d30d 100644 --- a/svx/source/dialog/imapwnd.hxx +++ b/svx/source/dialog/imapwnd.hxx @@ -34,7 +34,7 @@ #include <vcl/fixed.hxx> #include <vcl/button.hxx> #include <vcl/menu.hxx> -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #include <svtools/imapobj.hxx> #include <svtools/transfer.hxx> #include <svtools/imap.hxx> diff --git a/svx/source/dialog/impgrf.cxx b/svx/source/dialog/impgrf.cxx index b60c391f00..be32ba5778 100644 --- a/svx/source/dialog/impgrf.cxx +++ b/svx/source/dialog/impgrf.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,14 +35,14 @@ #include <limits.h> // USHRT_MAX #include <tools/urlobj.hxx> #include <tools/bigint.hxx> -#include <svtools/eitem.hxx> -#include <svtools/stritem.hxx> +#include <svl/eitem.hxx> +#include <svl/stritem.hxx> #include <sfx2/docfile.hxx> #include <sfx2/dispatch.hxx> #include <vcl/msgbox.hxx> #include <vcl/waitobj.hxx> -#include <svtools/pathoptions.hxx> -#include <svtools/viewoptions.hxx> +#include <unotools/pathoptions.hxx> +#include <unotools/viewoptions.hxx> #include <unotools/localfilehelper.hxx> #include <ucbhelper/content.hxx> #include <osl/file.hxx> @@ -55,7 +55,7 @@ using namespace com::sun::star::uno; #include "impgrf.hrc" #define _SVX_IMPGRF_CXX -#include "impgrf.hxx" +#include "svx/impgrf.hxx" #include <svx/dialmgr.hxx> #include "svxerr.hxx" @@ -111,7 +111,7 @@ int LoadGraphic( const String &rPath, const String &rFilterName, nRes = pFilter->ImportGraphic( rGraphic, rPath, *pStream, nFilter, pDeterminedFormat ); -#ifndef PRODUCT +#ifdef DBG_UTIL if( nRes ) { if( pMed ) diff --git a/svx/source/dialog/makefile.mk b/svx/source/dialog/makefile.mk index c54081365a..7bcdcf4a4c 100644 --- a/svx/source/dialog/makefile.mk +++ b/svx/source/dialog/makefile.mk @@ -54,10 +54,8 @@ SRC1FILES = \ dlgctrl.src \ docrecovery.src \ fontwork.src \ - frmdirlbox.src \ frmsel.src \ hdft.src \ - hyperdlg.src \ hyphen.src \ hyprlink.src \ imapdlg.src \ @@ -70,6 +68,7 @@ SRC1FILES = \ rubydialog.src\ ruler.src \ srchdlg.src \ + svxbmpnumvalueset.src \ swframeposstrings.src \ thesdlg.src \ txenctab.src \ @@ -129,7 +128,6 @@ LIB2OBJFILES= \ $(SLO)$/passwd.obj \ $(SLO)$/pfiledlg.obj \ $(SLO)$/prtqry.obj \ - $(SLO)$/radiobtnbox.obj \ $(SLO)$/relfld.obj \ $(SLO)$/rlrcitem.obj \ $(SLO)$/rubydialog.obj \ @@ -166,12 +164,3 @@ SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES) .INCLUDE : target.mk -$(INCCOM)$/cuilib.hxx: makefile.mk -.IF "$(GUI)"=="UNX" - $(RM) $@ - echo \#define DLL_NAME \"libcui$(DLLPOSTFIX)$(DLLPOST)\" >$@ -.ELSE - echo $(EMQ)#define DLL_NAME $(EMQ)"cui$(DLLPOSTFIX)$(DLLPOST)$(EMQ)" >$@ -.ENDIF - -$(SLO)$/svxdlg.obj : $(INCCOM)$/cuilib.hxx diff --git a/svx/source/dialog/opengrf.cxx b/svx/source/dialog/opengrf.cxx index f6564449ae..6ca40f2486 100644 --- a/svx/source/dialog/opengrf.cxx +++ b/svx/source/dialog/opengrf.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,7 +46,7 @@ #include <com/sun/star/ui/dialogs/XFilePickerNotifier.hpp> #include <com/sun/star/ui/dialogs/XFilePreview.hpp> #include <com/sun/star/ui/dialogs/XFilterManager.hpp> -#include <svtools/urihelper.hxx> +#include <svl/urihelper.hxx> #ifndef _UNOTOOLS_UCBSTREAMHELPER_HXX #include <unotools/ucbstreamhelper.hxx> #endif @@ -58,7 +58,7 @@ #endif #include <sfx2/filedlghelper.hxx> #include <sfx2/docfile.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <svx/dialmgr.hxx> #include "opengrf.hxx" diff --git a/svx/source/dialog/radiobtnbox.cxx b/svx/source/dialog/radiobtnbox.cxx deleted file mode 100644 index dd10431109..0000000000 --- a/svx/source/dialog/radiobtnbox.cxx +++ /dev/null @@ -1,124 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: radiobtnbox.cxx,v $ - * $Revision: 1.5 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org 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 version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svx.hxx" - -/* -#ifdef SVX_DLLIMPLEMENTATION -#undef SVX_DLLIMPLEMENTATION -#endif -*/ - -// include --------------------------------------------------------------- - -#include "radiobtnbox.hxx" -#include <svx/dialmgr.hxx> - -namespace svx { - -// class SvxRadioButtonListBox ---------------------------------------------------- - -SvxRadioButtonListBox::SvxRadioButtonListBox( Window* _pParent, const ResId& _rId ) : - - SvxSimpleTable( _pParent, _rId ) - -{ - EnableCheckButton( new SvLBoxButtonData( this, true ) ); -} - -SvxRadioButtonListBox::~SvxRadioButtonListBox() -{ -} - -void SvxRadioButtonListBox::SetTabs() -{ - SvxSimpleTable::SetTabs(); -/* - USHORT nAdjust = SV_LBOXTAB_ADJUST_RIGHT | SV_LBOXTAB_ADJUST_LEFT | - SV_LBOXTAB_ADJUST_CENTER | SV_LBOXTAB_ADJUST_NUMERIC | SV_LBOXTAB_FORCE; - if ( aTabs.Count() > 0 ) - { - SvLBoxTab* pTab = (SvLBoxTab*)aTabs.GetObject(0); - pTab->nFlags &= ~nAdjust; - pTab->nFlags |= SV_LBOXTAB_PUSHABLE | SV_LBOXTAB_ADJUST_CENTER | SV_LBOXTAB_FORCE; - } -*/ -} - -void SvxRadioButtonListBox::MouseButtonUp( const MouseEvent& _rMEvt ) -{ - m_aCurMousePoint = _rMEvt.GetPosPixel(); - SvxSimpleTable::MouseButtonUp( _rMEvt ); -} - -void SvxRadioButtonListBox::KeyInput( const KeyEvent& rKEvt ) -{ - if ( !rKEvt.GetKeyCode().GetModifier() && KEY_SPACE == rKEvt.GetKeyCode().GetCode() ) - { - SvLBoxEntry* pEntry = FirstSelected(); - if ( GetCheckButtonState( pEntry ) == SV_BUTTON_UNCHECKED ) - { - SetCheckButtonState( pEntry, SV_BUTTON_CHECKED ); - GetCheckButtonHdl().Call( NULL ); - return ; - } - } - - SvxSimpleTable::KeyInput( rKEvt ); -} - -void SvxRadioButtonListBox::HandleEntryChecked( SvLBoxEntry* _pEntry ) -{ - Select( _pEntry, TRUE ); - SvButtonState eState = GetCheckButtonState( _pEntry ); - - if ( SV_BUTTON_CHECKED == eState ) - { - // we have radio button behavior -> so uncheck the other entries - SvLBoxEntry* pEntry = First(); - while ( pEntry ) - { - if ( pEntry != _pEntry ) - SetCheckButtonState( pEntry, SV_BUTTON_UNCHECKED ); - pEntry = Next( pEntry ); - } - } - else - SetCheckButtonState( _pEntry, SV_BUTTON_CHECKED ); -} - -const Point& SvxRadioButtonListBox::GetCurMousePoint() const -{ - return m_aCurMousePoint; -} - -} // end of namespace ::svx - diff --git a/svx/source/dialog/rlrcitem.cxx b/svx/source/dialog/rlrcitem.cxx index 552d2e862b..d81ec83ceb 100644 --- a/svx/source/dialog/rlrcitem.cxx +++ b/svx/source/dialog/rlrcitem.cxx @@ -32,7 +32,7 @@ #include "precompiled_svx.hxx" // INCLUDE --------------------------------------------------------------- -#include <svtools/rectitem.hxx> +#include <svl/rectitem.hxx> @@ -48,7 +48,7 @@ #include "protitem.hxx" #include "rlrcitem.hxx" #include "rulritem.hxx" -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> // class SvxRulerItem ---------------------------------------------------- diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx index 5e67d87e28..74257dec75 100644 --- a/svx/source/dialog/rubydialog.cxx +++ b/svx/source/dialog/rubydialog.cxx @@ -38,7 +38,7 @@ #include <sfx2/app.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/viewfrm.hxx> -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/style/XStyle.hpp> #include <com/sun/star/text/XRubySelection.hpp> diff --git a/svx/source/dialog/sdstring.src b/svx/source/dialog/sdstring.src index 9bf4160b78..853d9f3137 100644 --- a/svx/source/dialog/sdstring.src +++ b/svx/source/dialog/sdstring.src @@ -42,92 +42,14 @@ String RID_SVXSTR_GRADIENT { Text [ en-US ] = "Gradient" ; }; -String RID_SVXSTR_DESC_GRADIENT -{ - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für den Farbverlauf ein: : Geben Sie hier bitte den Namen f³r den Farbverlauf ein: */ - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für den Farbverlauf ein: : Geben Sie hier bitte den Namen f³r den Farbverlauf ein: */ - Text [ en-US ] = "Please enter a name for the gradient:" ; -}; -String RID_SVXSTR_DEL_GRADIENT -{ - /* ### ACHTUNG: Neuer Text in Resource? Farbverlauf löschen : Farbverlauf l÷schen */ - /* ### ACHTUNG: Neuer Text in Resource? Farbverlauf löschen : Farbverlauf l÷schen */ - Text [ en-US ] = "Delete gradient" ; -}; -String RID_SVXSTR_ASK_DEL_GRADIENT -{ - /* ### ACHTUNG: Neuer Text in Resource? Soll der Farbverlauf wirklich gelöscht werden? : Soll der Farbverlauf wirklich gel÷scht werden? */ - /* ### ACHTUNG: Neuer Text in Resource? Soll der Farbverlauf wirklich gelöscht werden? : Soll der Farbverlauf wirklich gel÷scht werden? */ - Text [ en-US ] = "Do you want to delete the gradient?" ; -}; -String RID_SVXSTR_ASK_CHANGE_GRADIENT -{ - /* ### ACHTUNG: Neuer Text in Resource? Der Farbverlauf wurde geändert und nicht gesichert. \nSie können den selektierten Farbverlauf ändern \noder einen neuen Farbverlauf hinzufügen. : Der Farbverlauf wurde geõndert und nicht gesichert. \nSie k÷nnen den selektierten Farbverlauf õndern \noder einen neuen Farbverlauf hinzuf³gen. */ - /* ### ACHTUNG: Neuer Text in Resource? Der Farbverlauf wurde geändert und nicht gesichert. \nSie können den selektierten Farbverlauf ändern \noder einen neuen Farbverlauf hinzufügen. : Der Farbverlauf wurde geõndert und nicht gesichert. \nSie k÷nnen den selektierten Farbverlauf õndern \noder einen neuen Farbverlauf hinzuf³gen. */ - Text [ en-US ] = "The gradient was modified without saving. \nModify the selected gradient or add a new gradient." ; -}; String RID_SVXSTR_BITMAP { Text [ en-US ] = "Bitmap" ; }; -String RID_SVXSTR_DESC_NEW_BITMAP -{ - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für die Bitmap ein: : Geben Sie hier bitte den Namen f³r die Bitmap ein: */ - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für die Bitmap ein: : Geben Sie hier bitte den Namen f³r die Bitmap ein: */ - Text [ en-US ] = "Please enter a name for the bitmap:" ; -}; -String RID_SVXSTR_DESC_EXT_BITMAP -{ - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für die externe Bitmap ein: : Geben Sie hier bitte den Namen f³r die externe Bitmap ein: */ - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für die externe Bitmap ein: : Geben Sie hier bitte den Namen f³r die externe Bitmap ein: */ - Text [ en-US ] = "Please enter a name for the external bitmap:" ; -}; -String RID_SVXSTR_DEL_BITMAP -{ - /* ### ACHTUNG: Neuer Text in Resource? Bitmap löschen : Bitmap l÷schen */ - /* ### ACHTUNG: Neuer Text in Resource? Bitmap löschen : Bitmap l÷schen */ - Text [ en-US ] = "Delete bitmap" ; -}; -String RID_SVXSTR_ASK_DEL_BITMAP -{ - /* ### ACHTUNG: Neuer Text in Resource? Soll die Bitmap wirklich gelöscht werden? : Soll die Bitmap wirklich gel÷scht werden? */ - /* ### ACHTUNG: Neuer Text in Resource? Soll die Bitmap wirklich gelöscht werden? : Soll die Bitmap wirklich gel÷scht werden? */ - Text [ en-US ] = "Are you sure you want to delete the bitmap?" ; -}; -String RID_SVXSTR_ASK_CHANGE_BITMAP -{ - /* ### ACHTUNG: Neuer Text in Resource? Die Bitmap wurde geändert und nicht gesichert. \nSie können die selektierte Bitmap ändern \noder eine neue Bitmap hinzufügen. : Die Bitmap wurde geõndert und nicht gesichert. \nSie k÷nnen die selektierte Bitmap õndern \noder eine neue Bitmap hinzuf³gen. */ - /* ### ACHTUNG: Neuer Text in Resource? Die Bitmap wurde geändert und nicht gesichert. \nSie können die selektierte Bitmap ändern \noder eine neue Bitmap hinzufügen. : Die Bitmap wurde geõndert und nicht gesichert. \nSie k÷nnen die selektierte Bitmap õndern \noder eine neue Bitmap hinzuf³gen. */ - Text [ en-US ] = "The bitmap was modified without saving. \nModify the selected bitmap or add a new bitmap." ; -}; String RID_SVXSTR_LINESTYLE { Text [ en-US ] = "Line Style" ; }; -String RID_SVXSTR_DESC_LINESTYLE -{ - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für den Linienstil ein: : Geben Sie hier bitte den Namen f³r den Linienstil ein: */ - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für den Linienstil ein: : Geben Sie hier bitte den Namen f³r den Linienstil ein: */ - Text [ en-US ] = "Please enter a name for the line style:" ; -}; -String RID_SVXSTR_DEL_LINESTYLE -{ - /* ### ACHTUNG: Neuer Text in Resource? Linienstil löschen : Linienstil l÷schen */ - /* ### ACHTUNG: Neuer Text in Resource? Linienstil löschen : Linienstil l÷schen */ - Text [ en-US ] = "Delete line style" ; -}; -String RID_SVXSTR_ASK_DEL_LINESTYLE -{ - /* ### ACHTUNG: Neuer Text in Resource? Soll der Linienstil wirklich gelöscht werden? : Soll der Linienstil wirklich gel÷scht werden? */ - /* ### ACHTUNG: Neuer Text in Resource? Soll der Linienstil wirklich gelöscht werden? : Soll der Linienstil wirklich gel÷scht werden? */ - Text [ en-US ] = "Do you want to delete the line style?" ; -}; -String RID_SVXSTR_ASK_CHANGE_LINESTYLE -{ - /* ### ACHTUNG: Neuer Text in Resource? Der Linienstil wurde geändert und nicht gesichert. \nSie können den selektierten Linienstil ändern \noder einen neuen Linienstil hinzufügen. : Der Linienstil wurde geõndert und nicht gesichert. \nSie k÷nnen den selektierten Linienstil õndern \noder einen neuen Linienstil hinzuf³gen. */ - /* ### ACHTUNG: Neuer Text in Resource? Der Linienstil wurde geändert und nicht gesichert. \nSie können den selektierten Linienstil ändern \noder einen neuen Linienstil hinzufügen. : Der Linienstil wurde geõndert und nicht gesichert. \nSie k÷nnen den selektierten Linienstil õndern \noder einen neuen Linienstil hinzuf³gen. */ - Text [ en-US ] = "The line style was modified without saving. \nModify the selected line style or add a new line style." ; -}; String RID_SVXSTR_INVISIBLE { Text [ en-US ] = "Invisible" ; @@ -140,116 +62,11 @@ String RID_SVXSTR_HATCH { Text [ en-US ] = "Hatching" ; }; -String RID_SVXSTR_DESC_HATCH -{ - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für die Schraffur ein: : Geben Sie hier bitte den Namen f³r die Schraffur ein: */ - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für die Schraffur ein: : Geben Sie hier bitte den Namen f³r die Schraffur ein: */ - Text [ en-US ] = "Please enter a name for the hatching:" ; -}; -String RID_SVXSTR_DEL_HATCH -{ - /* ### ACHTUNG: Neuer Text in Resource? Schraffur löschen : Schraffur l÷schen */ - /* ### ACHTUNG: Neuer Text in Resource? Schraffur löschen : Schraffur l÷schen */ - Text [ en-US ] = "Delete hatching" ; -}; -String RID_SVXSTR_ASK_DEL_HATCH -{ - /* ### ACHTUNG: Neuer Text in Resource? Soll die Schraffur wirklich gelöscht werden? : Soll die Schraffur wirklich gel÷scht werden? */ - /* ### ACHTUNG: Neuer Text in Resource? Soll die Schraffur wirklich gelöscht werden? : Soll die Schraffur wirklich gel÷scht werden? */ - Text [ en-US ] = "Do you want to delete the hatching?" ; -}; -String RID_SVXSTR_ASK_CHANGE_HATCH -{ - /* ### ACHTUNG: Neuer Text in Resource? Die Schraffur wurde geändert und nicht gesichert. \nSie können die selektierte Schraffur ändern \noder eine neue Schraffur hinzufügen. : Die Schraffur wurde geõndert und nicht gesichert. \nSie k÷nnen die selektierte Schraffur õndern \noder eine neue Schraffur hinzuf³gen. */ - /* ### ACHTUNG: Neuer Text in Resource? Die Schraffur wurde geändert und nicht gesichert. \nSie können die selektierte Schraffur ändern \noder eine neue Schraffur hinzufügen. : Die Schraffur wurde geõndert und nicht gesichert. \nSie k÷nnen die selektierte Schraffur õndern \noder eine neue Schraffur hinzuf³gen. */ - Text [ en-US ] = "The hatching type was modified but not saved. \nModify the selected hatching type or add a new hatching type." ; -}; -String RID_SVXSTR_CHANGE -{ - /* ### ACHTUNG: Neuer Text in Resource? Ändern : Žndern */ - /* ### ACHTUNG: Neuer Text in Resource? Ändern : Žndern */ - Text [ en-US ] = "Modify" ; -}; -String RID_SVXSTR_ADD -{ - /* ### ACHTUNG: Neuer Text in Resource? Hinzufügen : Hinzuf³gen */ - /* ### ACHTUNG: Neuer Text in Resource? Hinzufügen : Hinzuf³gen */ - Text [ en-US ] = "Add" ; -}; -String RID_SVXSTR_DESC_COLOR -{ - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für die neue Farbe ein: : Geben Sie hier bitte den Namen f³r die neue Farbe ein: */ - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für die neue Farbe ein: : Geben Sie hier bitte den Namen f³r die neue Farbe ein: */ - Text [ en-US ] = "Please enter a name for the new color:" ; -}; -String RID_SVXSTR_DEL_COLOR -{ - /* ### ACHTUNG: Neuer Text in Resource? Farbe löschen : Farbe l÷schen */ - /* ### ACHTUNG: Neuer Text in Resource? Farbe löschen : Farbe l÷schen */ - Text [ en-US ] = "Delete color" ; -}; -String RID_SVXSTR_ASK_DEL_COLOR -{ - /* ### ACHTUNG: Neuer Text in Resource? Soll die Farbe wirklich gelöscht werden? : Soll die Farbe wirklich gel÷scht werden? */ - /* ### ACHTUNG: Neuer Text in Resource? Soll die Farbe wirklich gelöscht werden? : Soll die Farbe wirklich gel÷scht werden? */ - Text [ en-US ] = "Do you want to delete the color?" ; -}; -String RID_SVXSTR_ASK_CHANGE_COLOR -{ - /* ### ACHTUNG: Neuer Text in Resource? Die Farbe wurde geändert und nicht gesichert. \nSie können die selektierte Farbe ändern \noder eine neue Farbe hinzufügen. : Die Farbe wurde geõndert und nicht gesichert. \nSie k÷nnen die selektierte Farbe õndern \noder eine neue Farbe hinzuf³gen. */ - /* ### ACHTUNG: Neuer Text in Resource? Die Farbe wurde geändert und nicht gesichert. \nSie können die selektierte Farbe ändern \noder eine neue Farbe hinzufügen. : Die Farbe wurde geõndert und nicht gesichert. \nSie k÷nnen die selektierte Farbe õndern \noder eine neue Farbe hinzuf³gen. */ - Text [ en-US ] = "The color was modified without saving.\nModify the selected color or add a new color." ; -}; -String RID_SVXSTR_TABLE -{ - Text [ en-US ] = "Table" ; -}; -String RID_SVXSTR_WRITE_DATA_ERROR -{ - Text [ en-US ] = "The file could not be saved!" ; -}; -String RID_SVXSTR_READ_DATA_ERROR -{ - Text [ en-US ] = "The file could not be loaded!" ; -}; -String RID_SVXSTR_WARN_TABLE_OVERWRITE -{ - /* ### ACHTUNG: Neuer Text in Resource? Die Tabelle wurde geändert und nicht gespeichert. \nSoll die Tabelle gespeichert werden? : Die Tabelle wurde geõndert und nicht gespeichert. \nSoll die Tabelle gespeichert werden? */ - /* ### ACHTUNG: Neuer Text in Resource? Die Tabelle wurde geändert und nicht gespeichert. \nSoll die Tabelle gespeichert werden? : Die Tabelle wurde geõndert und nicht gespeichert. \nSoll die Tabelle gespeichert werden? */ - Text [ en-US ] = "The list was modified without saving. Would you like to save the list now?" ; -}; -String RID_SVXSTR_WARN_NAME_DUPLICATE -{ - Text [ en-US ] = "The name you have entered already exists. \nPlease choose another name." ; -}; String RID_SVXSTR_LINEEND { Text [ en-US ] = "Arrowheads" ; }; -String RID_SVXSTR_DESC_LINEEND -{ - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für das neue Linienende ein: : Geben Sie hier bitte den Namen f³r das neue Linienende ein: */ - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für das neue Linienende ein: : Geben Sie hier bitte den Namen f³r das neue Linienende ein: */ - Text [ en-US ] = "Please enter a name for the new arrowhead:" ; -}; -String RID_SVXSTR_DEL_LINEEND -{ - /* ### ACHTUNG: Neuer Text in Resource? Linienende löschen : Linienende l÷schen */ - /* ### ACHTUNG: Neuer Text in Resource? Linienende löschen : Linienende l÷schen */ - Text [ en-US ] = "Delete line ends" ; -}; -String RID_SVXSTR_ASK_DEL_LINEEND -{ - /* ### ACHTUNG: Neuer Text in Resource? Soll das Linienende wirklich gelöscht werden? : Soll das Linienende wirklich gel÷scht werden? */ - /* ### ACHTUNG: Neuer Text in Resource? Soll das Linienende wirklich gelöscht werden? : Soll das Linienende wirklich gel÷scht werden? */ - Text [ en-US ] = "Do you want to delete the arrowhead?" ; -}; -String RID_SVXSTR_ASK_CHANGE_LINEEND -{ - /* ### ACHTUNG: Neuer Text in Resource? Das Linienende wurde geändert und nicht gesichert. \nMöchten Sie das Linienende jetzt sichern? : Das Linienende wurde geõndert und nicht gesichert. \nM÷chten Sie das Linienende jetzt sichern? */ - /* ### ACHTUNG: Neuer Text in Resource? Das Linienende wurde geändert und nicht gesichert. \nMöchten Sie das Linienende jetzt sichern? : Das Linienende wurde geõndert und nicht gesichert. \nM÷chten Sie das Linienende jetzt sichern? */ - Text [ en-US ] = "The arrowhead was modified without saving.\nWould you like to save the arrowhead now?" ; -}; + String RID_SVXSTR_CLOSE { /* ### ACHTUNG: Neuer Text in Resource? Schließen : Schlie˜en */ @@ -1375,6 +1192,30 @@ String RID_SVXSTR_TRASNGR0 // ********************************************************************** EOF + // RID_SVXSTR_FIELDUNIT_TABLE -------------------------------------------- + +StringArray RID_SVXSTR_FIELDUNIT_TABLE +{ + ItemList [ en-US ] = + { + < "Millimeter" ; FUNIT_MM ; > ; + < "Centimeter" ; FUNIT_CM ; > ; + < "Meter" ; FUNIT_M ; > ; + < "Kilometer" ; FUNIT_KM ; > ; + < "Inch" ; FUNIT_INCH ; > ; + < "Foot" ; FUNIT_FOOT ; > ; + < "Miles" ; FUNIT_MILE ; > ; + < "Pica" ; FUNIT_PICA ; > ; + < "Point" ; FUNIT_POINT ; > ; + }; + }; + +// unbekannte Zeichenfarbe +String RID_SVXSTR_COLOR_USER +{ + Text [ en-US ] = "User" ; +}; + diff --git a/svx/source/dialog/srchctrl.cxx b/svx/source/dialog/srchctrl.cxx index 515959fb03..3f117045b2 100644 --- a/svx/source/dialog/srchctrl.cxx +++ b/svx/source/dialog/srchctrl.cxx @@ -33,7 +33,7 @@ // include --------------------------------------------------------------- #include <tools/pstm.hxx> -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <sfx2/objsh.hxx> #include <svx/svxids.hrc> diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index 670264aae4..7526313900 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -35,16 +35,16 @@ #include <vcl/wrkwin.hxx> #include <vcl/morebtn.hxx> #include <vcl/msgbox.hxx> -#include <svtools/slstitm.hxx> -#include <svtools/itemiter.hxx> -#include <svtools/style.hxx> -#include <svtools/searchopt.hxx> +#include <svl/slstitm.hxx> +#include <svl/itemiter.hxx> +#include <svl/style.hxx> +#include <unotools/searchopt.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/objsh.hxx> #include <sfx2/module.hxx> #include <sfx2/viewsh.hxx> #include <sfx2/basedlgs.hxx> -#include <svtools/cjkoptions.hxx> +#include <svl/cjkoptions.hxx> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/i18n/TransliterationModules.hpp> #include <com/sun/star/frame/XDispatch.hpp> @@ -52,7 +52,7 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/frame/XModuleManager.hpp> #include <comphelper/processfactory.hxx> -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #include <sfx2/app.hxx> #include <toolkit/unohlp.hxx> @@ -286,47 +286,6 @@ void SearchAttrItemList::Remove( USHORT nPos, USHORT nLen ) SrchAttrItemList::Remove( nPos, nLen ); } -/* //CHINA001 -// class SvxJSearchOptionsDialog ----------------------------------------- - -SvxJSearchOptionsDialog::SvxJSearchOptionsDialog( - Window *pParent, - const SfxItemSet& rOptionsSet, USHORT nUniqueId, INT32 nInitialFlags ) : - SfxSingleTabDialog ( pParent, rOptionsSet, RID_SVXPAGE_JSEARCH_OPTIONS ), - nInitialTlFlags( nInitialFlags ) -{ - pPage = (SvxJSearchOptionsPage *) - SvxJSearchOptionsPage::Create( this, rOptionsSet ); - SetTabPage( pPage ); //! implicitly calls pPage->Reset(...)! - pPage->EnableSaveOptions( FALSE ); -} - - -SvxJSearchOptionsDialog::~SvxJSearchOptionsDialog() -{ - // pPage will be implicitly destroyed by the - // SfxSingleTabDialog destructor -} - - -void SvxJSearchOptionsDialog::Activate() -{ - pPage->SetTransliterationFlags( nInitialTlFlags ); -} - - -INT32 SvxJSearchOptionsDialog::GetTransliterationFlags() const -{ - return pPage->GetTransliterationFlags(); -} - - -void SvxJSearchOptionsDialog::SetTransliterationFlags( INT32 nSettings ) -{ - pPage->SetTransliterationFlags( nSettings ); -} -*/ //CHINA001 - #if ENABLE_LAYOUT #undef SfxModelessDialog #define SfxModelessDialog(bindings, child, parent, id) SfxDialog (parent, "find-and-replace.xml", id, bindings, child) @@ -1589,12 +1548,11 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn ) { SfxItemSet aSet( SFX_APP()->GetPool() ); pSearchItem->SetTransliterationFlags( GetTransliterationFlags() ); - //CHINA001 SvxJSearchOptionsDialog aDlg( this, aSet, RID_SVXPAGE_JSEARCH_OPTIONS, - //CHINA001 pSearchItem->GetTransliterationFlags() ); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) { - AbstractSvxJSearchOptionsDialog* aDlg = pFact->CreateSvxJSearchOptionsDialog( LAYOUT_THIS_WINDOW (this), aSet, RID_SVXPAGE_JSEARCH_OPTIONS, pSearchItem->GetTransliterationFlags(), RID_SVXPAGE_JSEARCH_OPTIONS ); + AbstractSvxJSearchOptionsDialog* aDlg = pFact->CreateSvxJSearchOptionsDialog( LAYOUT_THIS_WINDOW (this), aSet, + pSearchItem->GetTransliterationFlags() ); DBG_ASSERT(aDlg, "Dialogdiet fail!");//CHINA001 int nRet = aDlg->Execute(); //CHINA001 int nRet = aDlg.Execute(); if (RET_OK == nRet) //! true only if FillItemSet of SvxJSearchOptionsPage returns true @@ -2280,7 +2238,7 @@ IMPL_LINK( SvxSearchDialog, AttributeHdl_Impl, Button *, EMPTYARG ) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) { - VclAbstractDialog* pDlg = pFact->CreateSvxSearchAttributeDialog( LAYOUT_THIS_WINDOW (this), *pSearchList, pImpl->pRanges, RID_SVXDLG_SEARCHATTR ); + VclAbstractDialog* pDlg = pFact->CreateSvxSearchAttributeDialog( LAYOUT_THIS_WINDOW (this), *pSearchList, pImpl->pRanges ); DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 pDlg->Execute(); delete pDlg; diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx index 5f89bbda4e..10a572d43a 100644 --- a/svx/source/dialog/svxbmpnumvalueset.cxx +++ b/svx/source/dialog/svxbmpnumvalueset.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,17 +37,17 @@ #include <tools/shl.hxx> #include <i18npool/mslangid.hxx> #include <svtools/valueset.hxx> -#include <svtools/languageoptions.hxx> +#include <svl/languageoptions.hxx> #ifndef _SVX_HELPID_HRC #include <helpid.hrc> #endif #include <svx/numitem.hxx> -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <vcl/svapp.hxx> #include <gallery.hxx> -#include <svtools/urihelper.hxx> +#include <svl/urihelper.hxx> #include <svx/brshitem.hxx> -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <sfx2/objsh.hxx> #include <vcl/graph.hxx> #include <vcl/msgbox.hxx> @@ -60,7 +60,7 @@ #include <drawitem.hxx> #include <numvset.hxx> #include <htmlmode.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <svtools/ctrltool.hxx> #include <unolingu.hxx> #include <com/sun/star/style/NumberingType.hpp> @@ -355,8 +355,8 @@ void SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt ) sPrefixes[i].getStr()[0] != 0) { pVDev->SetFont(aFont); - pVDev->DrawText(aLeft, sPrefixes[i]); - aLeft.X() += pDev->GetTextWidth(sPrefixes[i]); + pVDev->DrawText(aLeft, sPrefixes[i]); + aLeft.X() += pDev->GetTextWidth(sPrefixes[i]); } if(aParentNumberings[i]) { diff --git a/svx/source/dialog/svxbmpnumvalueset.src b/svx/source/dialog/svxbmpnumvalueset.src new file mode 100644 index 0000000000..3b3bd90d25 --- /dev/null +++ b/svx/source/dialog/svxbmpnumvalueset.src @@ -0,0 +1,130 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: numpages.src,v $ + * $Revision: 1.64.242.1 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org 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 version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#include <svx/dialogs.hrc> + +String RID_SVXSTR_BULLET_DESCRIPTION_0 +{ + Text [en-US] = "Solid small circular bullets"; +}; +String RID_SVXSTR_BULLET_DESCRIPTION_1 +{ + Text [en-US] = "Solid large circular bullets"; +}; +String RID_SVXSTR_BULLET_DESCRIPTION_2 +{ + Text [en-US] = "Solid diamond bullets"; +}; +String RID_SVXSTR_BULLET_DESCRIPTION_3 +{ + Text [en-US] = "Solid large square bullets"; +}; +String RID_SVXSTR_BULLET_DESCRIPTION_4 +{ + Text [en-US] = "Right pointing arrow bullets filled out"; +}; +String RID_SVXSTR_BULLET_DESCRIPTION_5 +{ + Text [en-US] = "Right pointing arrow bullets"; +}; +String RID_SVXSTR_BULLET_DESCRIPTION_6 +{ + Text [en-US] = "Check mark bullets"; +}; +String RID_SVXSTR_BULLET_DESCRIPTION_7 +{ + Text [en-US] = "Tick mark bullets"; +}; +String RID_SVXSTR_SINGLENUM_DESCRIPTION_0 +{ + Text [en-US] = "Number 1) 2) 3)"; +}; +String RID_SVXSTR_SINGLENUM_DESCRIPTION_1 +{ + Text [en-US] = "Number 1. 2. 3."; +}; +String RID_SVXSTR_SINGLENUM_DESCRIPTION_2 +{ + Text [en-US] = "Number (1) (2) (3)"; +}; +String RID_SVXSTR_SINGLENUM_DESCRIPTION_3 +{ + Text [en-US] = "Uppercase Roman number I. II. III."; +}; +String RID_SVXSTR_SINGLENUM_DESCRIPTION_4 +{ + Text [en-US] = "Uppercase letter A) B) C)"; +}; +String RID_SVXSTR_SINGLENUM_DESCRIPTION_5 +{ + Text [en-US] = "Lowercase letter a) b) c)"; +}; +String RID_SVXSTR_SINGLENUM_DESCRIPTION_6 +{ + Text [en-US] = "Lowercase letter (a) (b) (c)"; +}; +String RID_SVXSTR_SINGLENUM_DESCRIPTION_7 +{ + Text [en-US] = "Lowercase Roman number i. ii. iii."; +}; + +String RID_SVXSTR_OUTLINENUM_DESCRIPTION_0 +{ + Text [en-US] = "Numeric, numeric, lowercase letters, solid small circular bullet"; +}; +String RID_SVXSTR_OUTLINENUM_DESCRIPTION_1 +{ + Text [en-US] = "Numeric, lowercase letters, solid small circular bullet"; +}; +String RID_SVXSTR_OUTLINENUM_DESCRIPTION_2 +{ + Text [en-US] = "Numeric, lowercase letters, lowercase Roman, uppercase letters, solid small circular bullet"; +}; +String RID_SVXSTR_OUTLINENUM_DESCRIPTION_3 +{ + Text [en-US] = "Numeric"; +}; +String RID_SVXSTR_OUTLINENUM_DESCRIPTION_4 +{ + Text [en-US] = "Uppercase Roman, uppercase letters, lowercase Roman, lowercase letters, solid small circular bullet"; +}; +String RID_SVXSTR_OUTLINENUM_DESCRIPTION_5 +{ + Text [en-US] = "Uppercase letters, uppercase Roman, lowercase letters, lowercase Roman, solid small circular bullet"; +}; +String RID_SVXSTR_OUTLINENUM_DESCRIPTION_6 +{ + Text [en-US] = "Numeric with all sublevels"; +}; +String RID_SVXSTR_OUTLINENUM_DESCRIPTION_7 +{ + Text [en-US] = "Right pointing bullet, right pointing arrow bullet, solid diamond bullet, solid small circular bullet"; +}; + diff --git a/svx/source/dialog/svxdlg.cxx b/svx/source/dialog/svxdlg.cxx index dce467dc94..35271fed21 100644 --- a/svx/source/dialog/svxdlg.cxx +++ b/svx/source/dialog/svxdlg.cxx @@ -32,12 +32,13 @@ #include "precompiled_svx.hxx" #include <svx/svxdlg.hxx> -#include "cuilib.hxx" - -#include <osl/module.hxx> -#include <tools/string.hxx> SvxAbstractDialogFactory* SvxAbstractDialogFactory::Create() { return (SvxAbstractDialogFactory*) VclAbstractDialogFactory::Create(); } + +SvxAbstractDialogFactory::~SvxAbstractDialogFactory() +{ +} + diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx index 13d479b294..50c3b5a64d 100644 --- a/svx/source/dialog/svxruler.cxx +++ b/svx/source/dialog/svxruler.cxx @@ -37,11 +37,11 @@ #include <limits.h> #include <tools/shl.hxx> #include <vcl/image.hxx> -#include <svtools/eitem.hxx> -#include <svtools/rectitem.hxx> +#include <svl/eitem.hxx> +#include <svl/rectitem.hxx> #include <sfx2/dispatch.hxx> -#include <svtools/smplhint.hxx> +#include <svl/smplhint.hxx> @@ -2761,8 +2761,9 @@ void SvxRuler::EvalModifier() case KEY_MOD1: { const RulerType eType = GetDragType(); nDragType = DRAG_OBJECT_SIZE_PROPORTIONAL; - if(RULER_TYPE_BORDER == eType || RULER_TYPE_TAB == eType|| - RULER_TYPE_MARGIN1&&pColumnItem) + if( RULER_TYPE_TAB == eType || + ( ( RULER_TYPE_BORDER == eType || RULER_TYPE_MARGIN1 == eType ) && + pColumnItem ) ) PrepareProportional_Impl(eType); break; } diff --git a/svx/source/dialog/thesdlg.cxx b/svx/source/dialog/thesdlg.cxx index 78fb5fc85a..8e5170b6d6 100644 --- a/svx/source/dialog/thesdlg.cxx +++ b/svx/source/dialog/thesdlg.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include <tools/shl.hxx> -#include <svtools/lngmisc.hxx> +#include <svl/lngmisc.hxx> #include <vcl/wrkwin.hxx> #ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> |