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 | db2e29794ffa161476c668e25cf4e86d19091665 (patch) | |
tree | 2018ae22146a57c74641468f9b67e9dc2a1b7ccf /automation | |
parent | f19e59318176c1952ad264996f9e0cee3e8e3982 (diff) | |
parent | 8a5b59989048d67b567819ee2038d4bff54ca184 (diff) |
rebase to DEV300_m69
Diffstat (limited to 'automation')
-rw-r--r-- | automation/inc/automation/communi.hxx | 2 | ||||
-rw-r--r-- | automation/source/miniapp/testapp.hxx | 2 | ||||
-rw-r--r-- | automation/source/server/scmdstrm.cxx | 6 | ||||
-rw-r--r-- | automation/source/server/server.cxx | 2 | ||||
-rw-r--r-- | automation/source/server/statemnt.cxx | 8 | ||||
-rw-r--r-- | automation/source/testtool/makefile.mk | 4 | ||||
-rw-r--r-- | automation/source/testtool/objtest.cxx | 6 | ||||
-rw-r--r-- | automation/source/testtool/tcommuni.hxx | 2 |
8 files changed, 16 insertions, 16 deletions
diff --git a/automation/inc/automation/communi.hxx b/automation/inc/automation/communi.hxx index 2a7b702e38cb..3804ad3048e5 100644 --- a/automation/inc/automation/communi.hxx +++ b/automation/inc/automation/communi.hxx @@ -31,7 +31,7 @@ #ifndef _COMMUNI_HXX #define _COMMUNI_HXX -#include <svtools/svarray.hxx> +#include <svl/svarray.hxx> #include <vos/thread.hxx> #include <vos/mutex.hxx> #include <vcl/timer.hxx> diff --git a/automation/source/miniapp/testapp.hxx b/automation/source/miniapp/testapp.hxx index 0ab2b48d3579..55048d05cbb0 100644 --- a/automation/source/miniapp/testapp.hxx +++ b/automation/source/miniapp/testapp.hxx @@ -58,7 +58,7 @@ #ifndef _WRKWIN_HXX //autogen #include <vcl/wrkwin.hxx> #endif -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include "editwin.hxx" diff --git a/automation/source/server/scmdstrm.cxx b/automation/source/server/scmdstrm.cxx index 8888a007918c..a8abce528746 100644 --- a/automation/source/server/scmdstrm.cxx +++ b/automation/source/server/scmdstrm.cxx @@ -30,9 +30,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_automation.hxx" -#include <svtools/intitem.hxx> -#include <svtools/stritem.hxx> -#include <svtools/eitem.hxx> +#include <svl/intitem.hxx> +#include <svl/stritem.hxx> +#include <svl/eitem.hxx> #include "scmdstrm.hxx" #include "svcommstream.hxx" #include "rcontrol.hxx" diff --git a/automation/source/server/server.cxx b/automation/source/server/server.cxx index 988f4055a2eb..890e6ace540d 100644 --- a/automation/source/server/server.cxx +++ b/automation/source/server/server.cxx @@ -55,7 +55,7 @@ #if 1 #include <svtools/ttprops.hxx> #include <basic/ttstrhlp.hxx> -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #include <svtools/stringtransfer.hxx> #include <vcl/sound.hxx> #include "testtool.hrc" diff --git a/automation/source/server/statemnt.cxx b/automation/source/server/statemnt.cxx index 318a60a7259a..be501ae901f6 100644 --- a/automation/source/server/statemnt.cxx +++ b/automation/source/server/statemnt.cxx @@ -85,7 +85,7 @@ #include <vcl/wintypes.hxx> #include <svtools/valueset.hxx> #include <svtools/roadmap.hxx> -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include <svtools/extensionlistbox.hxx> // Hat keinen Includeschutz #include <svtools/svtdata.hxx> @@ -93,14 +93,14 @@ #include <svtools/stringtransfer.hxx> #include <tools/stream.hxx> #include <tools/fsys.hxx> -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #include <svtools/ttprops.hxx> #ifndef _BASIC_TTRESHLP_HXX #include <basic/ttstrhlp.hxx> #endif #include <basic/dispdefs.hxx> #include <vos/socket.hxx> -#include <svtools/pickerhistory.hxx> +#include <svl/pickerhistory.hxx> #include <com/sun/star/util/XCancellable.hpp> #include <sot/storage.hxx> @@ -4279,7 +4279,7 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl ) Edit *pMyEd = new Edit(pDlg,WB_CENTER | WB_BORDER ); pMyEd->SetSizePixel(Size(100,30)); - pDlg->SetText(CUniString("Schließen")); + pDlg->SetText(UniString("Schließen", RTL_TEXTENCODING_ISO_8859_1)); pDlg->Show(); pMyEd->Show(); ULONG nTime = Time().GetTime(); diff --git a/automation/source/testtool/makefile.mk b/automation/source/testtool/makefile.mk index 79a811fdaee7..e72c92c3b8e1 100644 --- a/automation/source/testtool/makefile.mk +++ b/automation/source/testtool/makefile.mk @@ -84,9 +84,9 @@ $(INCCOM)$/r_cmds.hxx : ..$/inc$/rcontrol.hxx \ $(MISC)$/xfilter.pl $(PERL) $(MISC)$/xfilter.pl ..$/inc rcontrol.hxx $(INCCOM)$/r_cmds RC_ -$(INCCOM)$/res_type.hxx : $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/vcl$/wintypes.hxx \ +$(INCCOM)$/res_type.hxx : $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/tools$/wintypes.hxx \ $(MISC)$/xfilter.pl - $(PERL) $(MISC)$/xfilter.pl $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT) vcl$/wintypes.hxx $(INCCOM)$/res_type WINDOW_ + $(PERL) $(MISC)$/xfilter.pl $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT) tools$/wintypes.hxx $(INCCOM)$/res_type WINDOW_ diff --git a/automation/source/testtool/objtest.cxx b/automation/source/testtool/objtest.cxx index e068530459a8..84dc21a1321a 100644 --- a/automation/source/testtool/objtest.cxx +++ b/automation/source/testtool/objtest.cxx @@ -58,7 +58,7 @@ using namespace com::sun::star::devtools; #include <vcl/svapp.hxx> #endif #include <svtools/stringtransfer.hxx> -#include <svtools/brdcst.hxx> +#include <svl/brdcst.hxx> //#ifndef _SBXCLASS_HXX //autogen #include <basic/sbx.hxx> //#endif @@ -495,8 +495,6 @@ void TestToolObj::LoadIniFile() // Laden der IniEinstellungen, die d abGP.Append( "04" ); #elif defined SOLARIS && defined INTEL abGP.Append( "05" ); // Solaris x86 -#elif defined IRIX - abGP.Append( "06" ); #elif defined HPUX abGP.Append( "07" ); #elif defined FREEBSD @@ -521,6 +519,8 @@ void TestToolObj::LoadIniFile() // Laden der IniEinstellungen, die d abGP.Append( "20" ); // Linux ia64 #elif defined LINUX && defined S390 abGP.Append( "21" ); // Linux S390 +#elif defined LINUX && defined HPPA + abGP.Append( "22" ); // Linux PA-RISC #else #error ("unknown platform. please request an ID for your platform on qa/dev") #endif diff --git a/automation/source/testtool/tcommuni.hxx b/automation/source/testtool/tcommuni.hxx index 4863f1fd428c..f31d397a7a00 100644 --- a/automation/source/testtool/tcommuni.hxx +++ b/automation/source/testtool/tcommuni.hxx @@ -30,7 +30,7 @@ #include <automation/communi.hxx> #include <tools/link.hxx> -#include <svtools/svarray.hxx> +#include <svl/svarray.hxx> #include <vos/thread.hxx> |