[Libreoffice-commits] .: 2 commits - sal/inc setup_native/inc setup_native/prj setup_native/source sfx2/inc sfx2/Package_inc.mk sfx2/source sw/source
Jan Holesovsky
kendy at kemper.freedesktop.org
Fri Aug 26 14:50:07 PDT 2011
sal/inc/systools/win32/qswin32.h | 52 ++++++++++
setup_native/inc/setup_native/qswin32.h | 52 ----------
setup_native/prj/d.lst | 2
setup_native/source/win32/customactions/quickstarter/shutdown_quickstart.cxx | 2
sfx2/Package_inc.mk | 1
sfx2/inc/sfx2/qswin32.h | 52 ----------
sfx2/source/appl/shutdowniconw32.cxx | 2
sw/source/core/layout/trvlfrm.cxx | 4
8 files changed, 56 insertions(+), 111 deletions(-)
New commits:
commit f952331f0cf11f624d1df7c1c5a7468c16ffdc82
Author: Jan Holesovsky <kendy at suse.cz>
Date: Fri Aug 26 23:49:40 2011 +0200
Remove unused parameter.
diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx
index ad41abd..550c8a9 100644
--- a/sw/source/core/layout/trvlfrm.cxx
+++ b/sw/source/core/layout/trvlfrm.cxx
@@ -103,7 +103,7 @@ namespace {
return bRet;
}
- long lcl_GetSurface( SwPosition* pPos, const SwPageFrm* pPageFrm )
+ long lcl_GetSurface( SwPosition* pPos )
{
SwRect aArea;
@@ -237,7 +237,7 @@ sal_Bool SwPageFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint,
//aktuellen an. Mit Flys ist es dann allerdings vorbei.
if ( SwLayoutFrm::GetCrsrOfst( &aTextPos, aPoint, pCMS ) )
{
- nTextSurface = lcl_GetSurface( &aTextPos, this );
+ nTextSurface = lcl_GetSurface( &aTextPos );
bTextRet = sal_True;
}
else
commit 9c7e4d87c327ad929992b0a0ff2e70f156de5ff8
Author: Jan Holesovsky <kendy at suse.cz>
Date: Fri Aug 26 23:46:41 2011 +0200
Move the header that made setup_native depending on sfx2.
diff --git a/sal/inc/systools/win32/qswin32.h b/sal/inc/systools/win32/qswin32.h
new file mode 100644
index 0000000..6953ded
--- /dev/null
+++ b/sal/inc/systools/win32/qswin32.h
@@ -0,0 +1,52 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+#ifndef _QSWIN32_H
+#define _QSWIN32_H
+
+#define QUICKSTART_CLASSNAMEA "SO Listener Class"
+#define QUICKSTART_WINDOWNAMEA "SO Listener Window"
+#define SHUTDOWN_QUICKSTART_MESSAGEA "SO KillTray"
+
+#define QUICKSTART_CLASSNAMEW L##QUICKSTART_CLASSNAMEA
+#define QUICKSTART_WINDOWNAMEW L##QUICKSTART_WINDOWNAMEA
+#define SHUTDOWN_QUICKSTART_MESSAGEW L##SHUTDOWN_QUICKSTART_MESSAGEA
+
+#ifdef UNICODE
+# define QUICKSTART_CLASSNAME QUICKSTART_CLASSNAMEW
+# define QUICKSTART_WINDOWNAME QUICKSTART_WINDOWNAMEW
+# define SHUTDOWN_QUICKSTART_MESSAGE SHUTDOWN_QUICKSTART_MESSAGEW
+#else
+# define QUICKSTART_CLASSNAME QUICKSTART_CLASSNAMEA
+# define QUICKSTART_WINDOWNAME QUICKSTART_WINDOWNAMEA
+# define SHUTDOWN_QUICKSTART_MESSAGE SHUTDOWN_QUICKSTART_MESSAGEA
+#endif
+
+#endif /* _QSWIN32_H */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/setup_native/inc/setup_native/qswin32.h b/setup_native/inc/setup_native/qswin32.h
deleted file mode 100644
index 6953ded..0000000
--- a/setup_native/inc/setup_native/qswin32.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * 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.
- *
- ************************************************************************/
-
-#ifndef _QSWIN32_H
-#define _QSWIN32_H
-
-#define QUICKSTART_CLASSNAMEA "SO Listener Class"
-#define QUICKSTART_WINDOWNAMEA "SO Listener Window"
-#define SHUTDOWN_QUICKSTART_MESSAGEA "SO KillTray"
-
-#define QUICKSTART_CLASSNAMEW L##QUICKSTART_CLASSNAMEA
-#define QUICKSTART_WINDOWNAMEW L##QUICKSTART_WINDOWNAMEA
-#define SHUTDOWN_QUICKSTART_MESSAGEW L##SHUTDOWN_QUICKSTART_MESSAGEA
-
-#ifdef UNICODE
-# define QUICKSTART_CLASSNAME QUICKSTART_CLASSNAMEW
-# define QUICKSTART_WINDOWNAME QUICKSTART_WINDOWNAMEW
-# define SHUTDOWN_QUICKSTART_MESSAGE SHUTDOWN_QUICKSTART_MESSAGEW
-#else
-# define QUICKSTART_CLASSNAME QUICKSTART_CLASSNAMEA
-# define QUICKSTART_WINDOWNAME QUICKSTART_WINDOWNAMEA
-# define SHUTDOWN_QUICKSTART_MESSAGE SHUTDOWN_QUICKSTART_MESSAGEA
-#endif
-
-#endif /* _QSWIN32_H */
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/setup_native/prj/d.lst b/setup_native/prj/d.lst
index 6221f73..ed5abf6 100644
--- a/setup_native/prj/d.lst
+++ b/setup_native/prj/d.lst
@@ -50,5 +50,3 @@ mkdir: %_DEST%\bin\osolsmf
..\scripts\osx_install_patch.applescript %_DEST%\bin\osx_install_patch.applescript
..\%__SRC%\lib\getuid.so %_DEST%\bin\getuid.so
-
-..\inc\setup_native\qswin32.h %_DEST%\inc\setup_native\qswin32.h
diff --git a/setup_native/source/win32/customactions/quickstarter/shutdown_quickstart.cxx b/setup_native/source/win32/customactions/quickstarter/shutdown_quickstart.cxx
index 0a31394..aa9316c 100644
--- a/setup_native/source/win32/customactions/quickstarter/shutdown_quickstart.cxx
+++ b/setup_native/source/win32/customactions/quickstarter/shutdown_quickstart.cxx
@@ -27,7 +27,7 @@
************************************************************************/
#include "quickstarter.hxx"
-#include <sfx2/qswin32.h>
+#include <systools/win32/qswin32.h>
static BOOL CALLBACK EnumWindowsProc( HWND hWnd, LPARAM lParam )
{
diff --git a/sfx2/Package_inc.mk b/sfx2/Package_inc.mk
index 86eaa65..e308d1b 100644
--- a/sfx2/Package_inc.mk
+++ b/sfx2/Package_inc.mk
@@ -137,6 +137,5 @@ $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/userinputinterception.hxx,sf
$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewfac.hxx,sfx2/viewfac.hxx))
$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewfrm.hxx,sfx2/viewfrm.hxx))
$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewsh.hxx,sfx2/viewsh.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/qswin32.h,sfx2/qswin32.h))
# vim: set noet sw=4 ts=4:
diff --git a/sfx2/inc/sfx2/qswin32.h b/sfx2/inc/sfx2/qswin32.h
deleted file mode 100644
index 6953ded..0000000
--- a/sfx2/inc/sfx2/qswin32.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * 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.
- *
- ************************************************************************/
-
-#ifndef _QSWIN32_H
-#define _QSWIN32_H
-
-#define QUICKSTART_CLASSNAMEA "SO Listener Class"
-#define QUICKSTART_WINDOWNAMEA "SO Listener Window"
-#define SHUTDOWN_QUICKSTART_MESSAGEA "SO KillTray"
-
-#define QUICKSTART_CLASSNAMEW L##QUICKSTART_CLASSNAMEA
-#define QUICKSTART_WINDOWNAMEW L##QUICKSTART_WINDOWNAMEA
-#define SHUTDOWN_QUICKSTART_MESSAGEW L##SHUTDOWN_QUICKSTART_MESSAGEA
-
-#ifdef UNICODE
-# define QUICKSTART_CLASSNAME QUICKSTART_CLASSNAMEW
-# define QUICKSTART_WINDOWNAME QUICKSTART_WINDOWNAMEW
-# define SHUTDOWN_QUICKSTART_MESSAGE SHUTDOWN_QUICKSTART_MESSAGEW
-#else
-# define QUICKSTART_CLASSNAME QUICKSTART_CLASSNAMEA
-# define QUICKSTART_WINDOWNAME QUICKSTART_WINDOWNAMEA
-# define SHUTDOWN_QUICKSTART_MESSAGE SHUTDOWN_QUICKSTART_MESSAGEA
-#endif
-
-#endif /* _QSWIN32_H */
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/shutdowniconw32.cxx b/sfx2/source/appl/shutdowniconw32.cxx
index f3bc6f0..319283c 100644
--- a/sfx2/source/appl/shutdowniconw32.cxx
+++ b/sfx2/source/appl/shutdowniconw32.cxx
@@ -51,7 +51,7 @@
#include <shlobj.h>
#include <objidl.h>
#include <osl/thread.h>
-#include <sfx2/qswin32.h>
+#include <systools/win32/qswin32.h>
#include <comphelper/sequenceashashmap.hxx>
#include <set>
More information about the Libreoffice-commits
mailing list