diff options
author | Philipp Lohmann [pl] <Philipp.Lohmann@Sun.COM> | 2010-01-14 19:11:13 +0100 |
---|---|---|
committer | Philipp Lohmann [pl] <Philipp.Lohmann@Sun.COM> | 2010-01-14 19:11:13 +0100 |
commit | 0dc15d0bc9adb9dcd2a1a5deea3f952b8a4e6689 (patch) | |
tree | 1fe24b3ce25cdfece23f43d4663f1adff67b6a1d /svtools/source/dialogs | |
parent | #i106926# fixed hidden text in view when cancelling print to file (diff) | |
parent | DEV300 masterfix: #i10000#: lineinfo.cxx: enable exceptions (corrected) (diff) | |
download | core-0dc15d0bc9adb9dcd2a1a5deea3f952b8a4e6689.tar.gz core-0dc15d0bc9adb9dcd2a1a5deea3f952b8a4e6689.zip |
rebase to DEV300_m69
Diffstat (limited to 'svtools/source/dialogs')
-rw-r--r-- | svtools/source/dialogs/addresstemplate.cxx | 16 | ||||
-rw-r--r-- | svtools/source/dialogs/addresstemplate.src | 2 | ||||
-rw-r--r-- | svtools/source/dialogs/filedlg2.hrc | 44 | ||||
-rw-r--r-- | svtools/source/dialogs/logindlg.cxx | 2 | ||||
-rw-r--r-- | svtools/source/dialogs/logindlg.src | 2 | ||||
-rw-r--r-- | svtools/source/dialogs/printdlg.cxx | 4 | ||||
-rw-r--r-- | svtools/source/dialogs/printdlg.hrc | 2 | ||||
-rw-r--r-- | svtools/source/dialogs/prnsetup.hrc | 2 | ||||
-rw-r--r-- | svtools/source/dialogs/propctrl.hxx | 118 | ||||
-rw-r--r-- | svtools/source/dialogs/roadmapwizard.cxx | 2 | ||||
-rw-r--r-- | svtools/source/dialogs/wizardmachine.cxx | 2 | ||||
-rw-r--r-- | svtools/source/dialogs/wizardmachine.src | 2 |
12 files changed, 142 insertions, 56 deletions
diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index 14ede88482a6..aa18a3683916 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -39,7 +39,7 @@ #include "addresstemplate.hrc" #endif #ifndef _SVTOOLS_HRC -#include <svtools/svtools.hrc> +#include <svl/svtools.hrc> #endif #ifndef _SVT_HELPID_HRC #include <svtools/helpid.hrc> @@ -70,7 +70,7 @@ #include <com/sun/star/sdb/CommandType.hpp> #include "localresaccess.hxx" #ifndef SVTOOLS_FILENOTATION_HXX_ -#include "filenotation.hxx" +#include "svl/filenotation.hxx" #endif #include <tools/urlobj.hxx> @@ -324,8 +324,20 @@ public: virtual void setDatasourceName(const ::rtl::OUString& _rName); virtual void setCommand(const ::rtl::OUString& _rCommand); + + virtual void Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames); + virtual void Commit(); }; + +void AssignmentPersistentData::Notify( const com::sun::star::uno::Sequence<rtl::OUString>& ) +{ +} + +void AssignmentPersistentData::Commit() +{ +} + // ------------------------------------------------------------------- AssignmentPersistentData::AssignmentPersistentData() :ConfigItem( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Office.DataAccess/AddressBook" ))) diff --git a/svtools/source/dialogs/addresstemplate.src b/svtools/source/dialogs/addresstemplate.src index 9c4997cae9d2..63c0e6475597 100644 --- a/svtools/source/dialogs/addresstemplate.src +++ b/svtools/source/dialogs/addresstemplate.src @@ -29,7 +29,7 @@ ************************************************************************/ #ifndef _SVTOOLS_HRC -#include <svtools/svtools.hrc> +#include <svl/svtools.hrc> #endif #ifndef _SVT_ADDRESSTEMPLATE_HRC_ #include "addresstemplate.hrc" diff --git a/svtools/source/dialogs/filedlg2.hrc b/svtools/source/dialogs/filedlg2.hrc deleted file mode 100644 index a75e9047eafb..000000000000 --- a/svtools/source/dialogs/filedlg2.hrc +++ /dev/null @@ -1,44 +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: filedlg2.hrc,v $ - * $Revision: 1.3 $ - * - * 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. - * - ************************************************************************/ -#define STR_FILEDLG_SELECT 1000 -#define STR_FILEDLG_CANTCHDIR 1001 -#define STR_FILEDLG_OPEN 1002 -#define STR_FILEDLG_FILE 1003 -#define STR_FILEDLG_DIR 1004 -#define STR_FILEDLG_TYPE 1005 -#define STR_FILEDLG_CANTOPENFILE 1006 -#define STR_FILEDLG_CANTOPENDIR 1007 -#define STR_FILEDLG_OVERWRITE 1008 -#define STR_FILEDLG_GOUP 1009 -#define STR_FILEDLG_SAVE 1010 -#define STR_FILEDLG_DRIVES 1011 -#define STR_FILEDLG_HOME 1012 -#define STR_FILEDLG_NEWDIR 1013 -#define STR_FILEDLG_ASKNEWDIR 1014 diff --git a/svtools/source/dialogs/logindlg.cxx b/svtools/source/dialogs/logindlg.cxx index 7ac65a77947d..791e373086af 100644 --- a/svtools/source/dialogs/logindlg.cxx +++ b/svtools/source/dialogs/logindlg.cxx @@ -38,7 +38,7 @@ #include "logindlg.hrc" #endif #ifndef _SVTOOLS_HRC -#include <svtools/svtools.hrc> +#include <svl/svtools.hrc> #endif #include <svtools/svtdata.hxx> diff --git a/svtools/source/dialogs/logindlg.src b/svtools/source/dialogs/logindlg.src index 897597f383bf..b3ef357bbae4 100644 --- a/svtools/source/dialogs/logindlg.src +++ b/svtools/source/dialogs/logindlg.src @@ -29,7 +29,7 @@ ************************************************************************/ #ifndef _SVTOOLS_HRC -#include <svtools/svtools.hrc> +#include <svl/svtools.hrc> #endif #ifndef _SVTOOLS_LOGINDLG_HRC_ diff --git a/svtools/source/dialogs/printdlg.cxx b/svtools/source/dialogs/printdlg.cxx index 68acffc62a74..a006f209af18 100644 --- a/svtools/source/dialogs/printdlg.cxx +++ b/svtools/source/dialogs/printdlg.cxx @@ -47,7 +47,7 @@ #include <svtools/printdlg.hxx> #include <svtools/svtdata.hxx> #include <filedlg.hxx> -#include "pickerhelper.hxx" +#include "svl/pickerhelper.hxx" #ifndef _SVT_HELPID_HRC #include <svtools/helpid.hrc> #endif @@ -172,7 +172,7 @@ PrintDialog::~PrintDialog() void PrintDialog::ImplSetImages() { - if( ! GetSettings().GetStyleSettings().GetDialogColor().IsDark() ) + if( ! GetSettings().GetStyleSettings().GetHighContrastMode() ) { maImgCollate.SetModeImage( Image( SvtResId( RID_IMG_PRNDLG_COLLATE ) ), BMP_COLOR_NORMAL ); maImgNotCollate.SetModeImage( Image( SvtResId( RID_IMG_PRNDLG_NOCOLLATE ) ), BMP_COLOR_NORMAL ); diff --git a/svtools/source/dialogs/printdlg.hrc b/svtools/source/dialogs/printdlg.hrc index cae57cefdb0e..2f2f43e3ba10 100644 --- a/svtools/source/dialogs/printdlg.hrc +++ b/svtools/source/dialogs/printdlg.hrc @@ -28,7 +28,7 @@ * ************************************************************************/ -#include <svtools/svtools.hrc> +#include <svl/svtools.hrc> #define FL_PRINTER 1 #define LB_NAMES 2 diff --git a/svtools/source/dialogs/prnsetup.hrc b/svtools/source/dialogs/prnsetup.hrc index 33f98f7ed5e0..00623d97084c 100644 --- a/svtools/source/dialogs/prnsetup.hrc +++ b/svtools/source/dialogs/prnsetup.hrc @@ -27,7 +27,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include <svtools/svtools.hrc> +#include <svl/svtools.hrc> #define FL_PRINTER 1 #define LB_NAMES 2 diff --git a/svtools/source/dialogs/propctrl.hxx b/svtools/source/dialogs/propctrl.hxx new file mode 100644 index 000000000000..59019fc21b90 --- /dev/null +++ b/svtools/source/dialogs/propctrl.hxx @@ -0,0 +1,118 @@ +/************************************************************************* + * + * 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: propctrl.hxx,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. + * + ************************************************************************/ + +/* +#include <tools/stream.hxx> +#include <vcl/sound.hxx> +#include "sbx.hxx" +#include "sbxbase.hxx" +#include "sbxres.hxx" +#include <svl/brdcst.hxx> + */ + + +#ifndef __PROPED_HXX__ +#include <proped.hxx> +#endif +#ifndef _UNO_HXX +#include <usr/uno.hxx> +#endif +#ifndef _USR_SEQU_HXX +#include <usr/sequ.hxx> +#endif +#ifndef __TOOLSIDL_HXX__ +#include <usr/toolsidl.hxx> +#endif + +/* +class XPropertyEditor + : public XInterface +{ +public: + + virtual void setObject(const UsrAny& aToInspectObj) = 0; + + static Uik getSmartUik() { return(385); } +}; +*/ + +class PropertyEditorControler_Impl; +class SvPropertyBox; +class Window; + +class SimplePropertyEditor_Impl : + public XPropertyEditor, + public XPropertyEditorNavigation, + public UsrObject +{ + PropertyEditorControler_Impl* pActiveControler; + SvPropertyBox* mpPropBox; + UsrAny maStartUnoObj; + UsrAny maActiveUnoObj; + + // History der Objekte speichern + AnySequence maHistorySeq; + WSStringSequence maHistoryNames; + UINT32 mnHistoryCount; + INT32 mnActualHistoryLevel; + + // Einfache History via Dummy-Properties + BOOL bSimpleHistory; + + // Methode zum Anlegen/Aktivieren der Controller + void showObject( const UsrAny& aToShowObj ); + String getPath( void ); + +public: + // Provisorischer Ctor mit Parent-Window + SimplePropertyEditor_Impl( Window *pParent ); + ~SimplePropertyEditor_Impl(); + + // HACK fuer History-Test + void enableSimpleHistory( BOOL bHistory_ ) { bSimpleHistory = bHistory_; } + + SMART_UNO_DECLARATION(ImplIntrospection,UsrObject); + + // Methoden von XInterface + XInterface * queryInterface( Uik aUik ); + XIdlClassRef getIdlClass(); + + // Methoden von XPropertyEditor + virtual void setObject(const UsrAny& aToInspectObj, const XubString& aObjName); + + // Methoden von PropertyEditorNavigation + virtual void forward(void); + virtual void back(void); + +}; + + + + diff --git a/svtools/source/dialogs/roadmapwizard.cxx b/svtools/source/dialogs/roadmapwizard.cxx index b0fff49e5e8d..c7473e446986 100644 --- a/svtools/source/dialogs/roadmapwizard.cxx +++ b/svtools/source/dialogs/roadmapwizard.cxx @@ -32,7 +32,7 @@ #include "precompiled_svtools.hxx" #include <svtools/roadmapwizard.hxx> -#include <svtools/svtools.hrc> +#include <svl/svtools.hrc> #include <svtools/svtdata.hxx> #include "roadmap.hxx" #include <tools/debug.hxx> diff --git a/svtools/source/dialogs/wizardmachine.cxx b/svtools/source/dialogs/wizardmachine.cxx index c436256a31c4..602c2e3e6f8a 100644 --- a/svtools/source/dialogs/wizardmachine.cxx +++ b/svtools/source/dialogs/wizardmachine.cxx @@ -36,7 +36,7 @@ #include <vcl/msgbox.hxx> #include <svtools/svtdata.hxx> #ifndef _SVTOOLS_HRC -#include <svtools/svtools.hrc> +#include <svl/svtools.hrc> #endif //......................................................................... diff --git a/svtools/source/dialogs/wizardmachine.src b/svtools/source/dialogs/wizardmachine.src index d83fdd98824b..2fa50ef20bf6 100644 --- a/svtools/source/dialogs/wizardmachine.src +++ b/svtools/source/dialogs/wizardmachine.src @@ -29,7 +29,7 @@ ************************************************************************/ #ifndef _SVTOOLS_HRC -#include <svtools/svtools.hrc> +#include <svl/svtools.hrc> #endif String STR_WIZDLG_FINISH |