summaryrefslogtreecommitdiff
path: root/svtools/source/dialogs
diff options
context:
space:
mode:
Diffstat (limited to 'svtools/source/dialogs')
-rw-r--r--svtools/source/dialogs/addresstemplate.cxx10
-rw-r--r--svtools/source/dialogs/colrdlg.cxx2
-rw-r--r--svtools/source/dialogs/colrdlg.src8
-rw-r--r--svtools/source/dialogs/filedlg2.cxx2
-rw-r--r--svtools/source/dialogs/filedlg2.hxx2
-rw-r--r--svtools/source/dialogs/printdlg.cxx6
-rw-r--r--svtools/source/dialogs/prnsetup.cxx5
-rw-r--r--svtools/source/dialogs/propctrl.cxx6
-rw-r--r--svtools/source/dialogs/propctrl.hxx8
-rw-r--r--svtools/source/dialogs/property.cxx13
-rw-r--r--svtools/source/dialogs/wizardmachine.cxx2
-rw-r--r--svtools/source/dialogs/wizdlg.cxx6
12 files changed, 5 insertions, 65 deletions
diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx
index 9a66230f012c..1064fcae6314 100644
--- a/svtools/source/dialogs/addresstemplate.cxx
+++ b/svtools/source/dialogs/addresstemplate.cxx
@@ -32,15 +32,9 @@
#include "addresstemplate.hxx"
-#ifndef _SVT_ADDRESSTEMPLATE_HRC_
#include "addresstemplate.hrc"
-#endif
-#ifndef _SVTOOLS_HRC
#include <svtools/svtools.hrc>
-#endif
-#ifndef _SVT_HELPID_HRC
#include <svtools/helpid.hrc>
-#endif
#include <svtools/svtdata.hxx>
#include <tools/debug.hxx>
#include <comphelper/processfactory.hxx>
@@ -49,9 +43,7 @@
#include <vcl/waitobj.hxx>
#include <vcl/msgbox.hxx>
#include <toolkit/helper/vclunohelper.hxx>
-#ifndef _CPPUHELPER_EXTRACT_HXX_
#include <cppuhelper/extract.hxx>
-#endif
#include <comphelper/interaction.hxx>
#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
#include <com/sun/star/awt/XWindow.hpp>
@@ -66,9 +58,7 @@
#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
#include <com/sun/star/sdb/CommandType.hpp>
#include "localresaccess.hxx"
-#ifndef SVTOOLS_FILENOTATION_HXX_
#include "svl/filenotation.hxx"
-#endif
#include <tools/urlobj.hxx>
#include <algorithm>
diff --git a/svtools/source/dialogs/colrdlg.cxx b/svtools/source/dialogs/colrdlg.cxx
index a52cc4b0834c..7b7f8e3b1e21 100644
--- a/svtools/source/dialogs/colrdlg.cxx
+++ b/svtools/source/dialogs/colrdlg.cxx
@@ -27,8 +27,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_svtools.hxx"
-#ifndef GCC
-#endif
#include <svtools/svtdata.hxx>
#include "colrdlg.hrc"
diff --git a/svtools/source/dialogs/colrdlg.src b/svtools/source/dialogs/colrdlg.src
index ad9a5c1aa015..55517299c057 100644
--- a/svtools/source/dialogs/colrdlg.src
+++ b/svtools/source/dialogs/colrdlg.src
@@ -102,7 +102,7 @@ ModalDialog DLG_COLOR
Maximum = 100 ;
Last = 100 ;
Unit = FUNIT_CUSTOM ;
- CustomUnitText = " %" ;
+ CustomUnitText = "%" ;
};
MetricField NUM_MAGENTA
{
@@ -115,7 +115,7 @@ ModalDialog DLG_COLOR
Maximum = 100 ;
Last = 100 ;
Unit = FUNIT_CUSTOM ;
- CustomUnitText = " %" ;
+ CustomUnitText = "%" ;
};
MetricField NUM_YELLOW
{
@@ -128,7 +128,7 @@ ModalDialog DLG_COLOR
Maximum = 100 ;
Last = 100 ;
Unit = FUNIT_CUSTOM ;
- CustomUnitText = " %" ;
+ CustomUnitText = "%" ;
};
MetricField NUM_KEY
{
@@ -141,7 +141,7 @@ ModalDialog DLG_COLOR
Maximum = 100 ;
Last = 100 ;
Unit = FUNIT_CUSTOM ;
- CustomUnitText = " %" ;
+ CustomUnitText = "%" ;
};
FixedText FT_RED
{
diff --git a/svtools/source/dialogs/filedlg2.cxx b/svtools/source/dialogs/filedlg2.cxx
index b0e77d658931..6f94158f71fb 100644
--- a/svtools/source/dialogs/filedlg2.cxx
+++ b/svtools/source/dialogs/filedlg2.cxx
@@ -28,9 +28,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_svtools.hxx"
#include <vcl/svapp.hxx>
-#ifndef _SV_BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
#include <vcl/fixed.hxx>
#include <vcl/edit.hxx>
#include <vcl/lstbox.hxx>
diff --git a/svtools/source/dialogs/filedlg2.hxx b/svtools/source/dialogs/filedlg2.hxx
index 4d32565a2775..8a793eac3630 100644
--- a/svtools/source/dialogs/filedlg2.hxx
+++ b/svtools/source/dialogs/filedlg2.hxx
@@ -30,9 +30,7 @@
#include <tools/debug.hxx>
#include <tools/fsys.hxx>
-#ifndef _SV_BUTTON_HXX //autogen wg. PushButton
#include <vcl/button.hxx>
-#endif
#include <vcl/unohelp.hxx>
class FixedText;
diff --git a/svtools/source/dialogs/printdlg.cxx b/svtools/source/dialogs/printdlg.cxx
index 532fd3f61bb2..f39098137de6 100644
--- a/svtools/source/dialogs/printdlg.cxx
+++ b/svtools/source/dialogs/printdlg.cxx
@@ -28,12 +28,8 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_svtools.hxx"
#include <tools/debug.hxx>
-#ifndef _SV_APP_HXX
#include <vcl/svapp.hxx>
-#endif
-#ifndef _VCL_PRINT_HXX
#include <vcl/print.hxx>
-#endif
#include <vcl/msgbox.hxx>
#include <vcl/jobset.hxx>
#include <tools/urlobj.hxx>
@@ -45,9 +41,7 @@
#include <svtools/svtdata.hxx>
#include <filedlg.hxx>
#include "svl/pickerhelper.hxx"
-#ifndef _SVT_HELPID_HRC
#include <svtools/helpid.hrc>
-#endif
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
#include <com/sun/star/ui/dialogs/XFilePicker.hpp>
diff --git a/svtools/source/dialogs/prnsetup.cxx b/svtools/source/dialogs/prnsetup.cxx
index ceef2a88642b..a2557a08b2f6 100644
--- a/svtools/source/dialogs/prnsetup.cxx
+++ b/svtools/source/dialogs/prnsetup.cxx
@@ -28,12 +28,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_svtools.hxx"
#include <tools/debug.hxx>
-#ifndef _VCL_PRINT_HXX
#include <vcl/print.hxx>
-#endif
-
-#ifndef GCC
-#endif
#include <svtools/svtdata.hxx>
#include "prnsetup.hrc"
diff --git a/svtools/source/dialogs/propctrl.cxx b/svtools/source/dialogs/propctrl.cxx
index 675a93ca728b..f6ec090c9cbb 100644
--- a/svtools/source/dialogs/propctrl.cxx
+++ b/svtools/source/dialogs/propctrl.cxx
@@ -29,15 +29,9 @@
#include "precompiled_svtools.hxx"
-#ifndef _USR_INTROSP_HXX
#include <usr/inspect.hxx>
-#endif
-#ifndef _USR_SERINFO_HXX
#include <usr/serinfo.hxx>
-#endif
-#ifndef _USR_INTROSP_HXX
#include <usr/introsp.hxx>
-#endif
#include <propctrl.hxx>
#include <property.hxx>
diff --git a/svtools/source/dialogs/propctrl.hxx b/svtools/source/dialogs/propctrl.hxx
index 949873ceb1b7..43d50dad1761 100644
--- a/svtools/source/dialogs/propctrl.hxx
+++ b/svtools/source/dialogs/propctrl.hxx
@@ -35,18 +35,10 @@
*/
-#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
diff --git a/svtools/source/dialogs/property.cxx b/svtools/source/dialogs/property.cxx
index 3b081ce2f520..0d344cd1e7fb 100644
--- a/svtools/source/dialogs/property.cxx
+++ b/svtools/source/dialogs/property.cxx
@@ -28,19 +28,8 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_svtools.hxx"
-
-#ifndef GCC
-#endif
-
-//------------------------------------------------------------------
-
-//#include "Svitems.hxx"
-
#include "property.hxx"
-/*
-#include "property.hrc"
-#include "Scresid.hxx"
-*/
+
#define FRAME_OFFSET 4
diff --git a/svtools/source/dialogs/wizardmachine.cxx b/svtools/source/dialogs/wizardmachine.cxx
index 2053da80019d..6390c6d9b507 100644
--- a/svtools/source/dialogs/wizardmachine.cxx
+++ b/svtools/source/dialogs/wizardmachine.cxx
@@ -33,9 +33,7 @@
#include <tools/diagnose_ex.h>
#include <vcl/msgbox.hxx>
#include <svtools/svtdata.hxx>
-#ifndef _SVTOOLS_HRC
#include <svtools/svtools.hrc>
-#endif
//.........................................................................
namespace svt
diff --git a/svtools/source/dialogs/wizdlg.cxx b/svtools/source/dialogs/wizdlg.cxx
index f06b4f53ce7c..470691b6c8a3 100644
--- a/svtools/source/dialogs/wizdlg.cxx
+++ b/svtools/source/dialogs/wizdlg.cxx
@@ -30,15 +30,9 @@
#define _SVT_WIZDLG_CXX
#include <tools/debug.hxx>
-#ifndef _VCL_FIXED_HXX
#include <vcl/fixed.hxx>
-#endif
-#ifndef _VCL_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
-#ifndef _VCL_TABPAGE_HXX
#include <vcl/tabpage.hxx>
-#endif
#include <svtools/wizdlg.hxx>
// =======================================================================