summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Glazunov <vg@openoffice.org>2011-01-06 12:12:27 +0100
committerVladimir Glazunov <vg@openoffice.org>2011-01-06 12:12:27 +0100
commit0a7293b931cfb4bce33537c323fef7c0f233bce1 (patch)
tree499c67700cdb9b15ef21e287c64e2f4e4fa43dc7
parent0c9e2570a674217c20143d303bd0292706337757 (diff)
parentd7558d90bd58a343a50469fb121a32d7781503a0 (diff)
CWS-TOOLING: integrate CWS vcl117
Notes
split repo tag: base_ooo/DEV300_m97 split repo tag: base_ooo/DEV300_m98
-rw-r--r--dbaccess/source/ui/dlg/UserAdminDlg.src1
-rw-r--r--dbaccess/source/ui/dlg/advancedsettings.src1
-rw-r--r--dbaccess/source/ui/dlg/dbadmin.src2
-rw-r--r--dbaccess/source/ui/dlg/dbadminsetup.src1
-rw-r--r--reportdesign/source/ui/inspection/DataProviderHandler.cxx2
-rw-r--r--reportdesign/source/ui/inspection/GeometryHandler.cxx2
-rw-r--r--reportdesign/source/ui/inspection/ReportComponentHandler.cxx2
7 files changed, 3 insertions, 8 deletions
diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.src b/dbaccess/source/ui/dlg/UserAdminDlg.src
index faa7f33302d7..d3a59a511deb 100644
--- a/dbaccess/source/ui/dlg/UserAdminDlg.src
+++ b/dbaccess/source/ui/dlg/UserAdminDlg.src
@@ -49,7 +49,6 @@ TabDialog DLG_DATABASE_USERADMIN
{
OutputSize = TRUE ;
HelpId = HID_DSADMIN_TABCONTROL;
- SingleLine=TRUE;
};
String STR_PAGETITLE_USERADMIN
{
diff --git a/dbaccess/source/ui/dlg/advancedsettings.src b/dbaccess/source/ui/dlg/advancedsettings.src
index f37c67148e18..7a94c0dafb4c 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.src
+++ b/dbaccess/source/ui/dlg/advancedsettings.src
@@ -351,7 +351,6 @@ TabDialog DLG_DATABASE_ADVANCED
{
OutputSize = TRUE ;
HelpId = HID_DSADMIN_TABCONTROL;
- SingleLine=TRUE;
};
String STR_GENERATED_VALUE
diff --git a/dbaccess/source/ui/dlg/dbadmin.src b/dbaccess/source/ui/dlg/dbadmin.src
index 1d8744f07b53..f16edc83a761 100644
--- a/dbaccess/source/ui/dlg/dbadmin.src
+++ b/dbaccess/source/ui/dlg/dbadmin.src
@@ -113,7 +113,6 @@ TabDialog DLG_DATABASE_ADMINISTRATION
{
OutputSize = TRUE ;
HelpId = HID_DSADMIN_TABCONTROL;
- SingleLine=TRUE;
};
//.........................................................................
@@ -147,7 +146,6 @@ ModalDialog DLG_DATABASE_TYPE_CHANGE
{
OutputSize = TRUE ;
HelpId = HID_DSADMIN_TABCONTROL;
- SingleLine=TRUE;
};
Text [ en-US ] = "Database properties" ;
};
diff --git a/dbaccess/source/ui/dlg/dbadminsetup.src b/dbaccess/source/ui/dlg/dbadminsetup.src
index 5fc9cdc12f23..4d6812143598 100644
--- a/dbaccess/source/ui/dlg/dbadminsetup.src
+++ b/dbaccess/source/ui/dlg/dbadminsetup.src
@@ -56,7 +56,6 @@ ModalDialog DLG_DATABASE_WIZARD
{
OutputSize = TRUE ;
HelpId = HID_DSADMIN_TABCONTROL;
- SingleLine=TRUE;
};
String STR_DBWIZARDTITLE
diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx
index 8ac5053ff39f..dcc327060806 100644
--- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx
+++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx
@@ -51,7 +51,7 @@
#include <com/sun/star/inspection/XNumericControl.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/util/MeasureUnit.hpp>
-#include <vcl/fldunit.hxx>
+#include <tools/fldunit.hxx>
#include "metadata.hxx"
#include <vcl/svapp.hxx>
#include <vos/mutex.hxx>
diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index 084bd77f8d5b..c02683a97452 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -66,7 +66,7 @@
#include <vcl/msgbox.hxx>
#include <vcl/waitobj.hxx>
-#include <vcl/fldunit.hxx>
+#include <tools/fldunit.hxx>
#include <vcl/stdtext.hxx>
#include "ModuleHelper.hxx"
diff --git a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx
index 859c0da38709..d992206b6f54 100644
--- a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx
+++ b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx
@@ -40,7 +40,7 @@
#include <com/sun/star/inspection/XNumericControl.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/util/MeasureUnit.hpp>
-#include <vcl/fldunit.hxx>
+#include <tools/fldunit.hxx>
#include "metadata.hxx"
//........................................................................