diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-24 19:22:59 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-24 19:22:59 +0200 |
| commit | fd60b412a9609c22afd0f6c27ad089d3be709b7c (patch) | |
| tree | 5b5fe92ff4ff71830b029ebc5920a9d37dfc0e5e | |
| parent | ca569fd5af2fbfd606fe1cca734a386d7989dde9 (diff) | |
| parent | 7346524245242c5c16fc4743ad8e2dec15929838 (diff) | |
Merge branch 'master' into feature/gnumake4feature/gnumake4
45 files changed, 534 insertions, 1011 deletions
diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx index 65d1d206b0..6967048dab 100644 --- a/basic/source/runtime/iosys.cxx +++ b/basic/source/runtime/iosys.cxx @@ -377,10 +377,12 @@ sal_uIntPtr OslStream::PutData( const void* pData, sal_uIntPtr nSize ) sal_uIntPtr OslStream::SeekPos( sal_uIntPtr nPos ) { + ::osl::FileBase::RC rc = ::osl::FileBase::E_None; if( nPos == STREAM_SEEK_TO_END ) - maFile.setPos( osl_Pos_End, 0 ); + rc = maFile.setPos( osl_Pos_End, 0 ); else - maFile.setPos( osl_Pos_Absolut, (sal_uInt64)nPos ); + rc = maFile.setPos( osl_Pos_Absolut, (sal_uInt64)nPos ); + OSL_ENSURE(rc == ::osl::FileBase::E_None, "bad seek"); sal_uInt64 nRealPos(0); maFile.getPos( nRealPos ); return sal::static_int_cast<sal_uIntPtr>(nRealPos); diff --git a/desktop/prj/build.lst b/desktop/prj/build.lst index 4e59c5f215..a2c6f0ac6f 100644 --- a/desktop/prj/build.lst +++ b/desktop/prj/build.lst @@ -15,7 +15,6 @@ dt desktop\win32\source\guiloader nmake - w dt_guiloader dt_wrapper.w dt_inc N dt desktop\win32\source\guistdio nmake - w dt_guistdio dt_inc NULL dt desktop\win32\source\applauncher nmake - w dt_applauncher dt_inc NULL dt desktop\win32\source\applauncher\ooo nmake - w dt_applauncher_ooo dt_applauncher.w dt_inc NULL -dt desktop\win32\source\rebase nmake - w dt_rebase dt_inc NULL dt desktop\win32\source\QuickStart nmake - w dt_win32_quickstart NULL dt desktop\win32\source\QuickStart\so nmake - w dt_win32_quickstart_so dt_win32_quickstart.w NULL @@ -39,7 +38,7 @@ dt desktop\source\deployment\registry\configuration nmake - all dt_dp_registry_c dt desktop\source\deployment\registry\help nmake - all dt_dp_registry_help dt_inc NULL dt desktop\source\deployment\registry\executable nmake - all dt_dp_registry_executable dt_inc NULL dt desktop\scripts nmake - u dt_scripts dt_inc NULL -dt desktop\util nmake - all dt_util dt_app dt_pagein.u dt_spl dt_uwrapper.u dt_usplash.u dt_wrapper.w dt_officeloader.w dt_officeloader_unx.u dt_migr dt_rebase.w dt_win32_quickstart_so.w dt_zipintro NULL +dt desktop\util nmake - all dt_util dt_app dt_pagein.u dt_spl dt_uwrapper.u dt_usplash.u dt_wrapper.w dt_officeloader.w dt_officeloader_unx.u dt_migr dt_win32_quickstart_so.w dt_zipintro NULL dt desktop\zipintro nmake - all dt_zipintro NULL dt desktop\registry\data\org\openoffice\Office nmake - all sn_regconfig NULL dt desktop\qa\deployment_misc nmake - all sn_qa_deployment_misc dt_dp_misc dt_inc NULL diff --git a/desktop/prj/d.lst b/desktop/prj/d.lst index 6287afa02e..008ade9ff6 100644 --- a/desktop/prj/d.lst +++ b/desktop/prj/d.lst @@ -85,8 +85,6 @@ mkdir: %_DEST%\bin\odf4ms ..\%__SRC%\bin\unopkga*.dll %_DEST%\bin\unopkga*.dll ..\%__SRC%\lib\libunopkgapp.dylib %_DEST%\lib\libunopkgapp.dylib ..\%__SRC%\lib\libunopkgapp.so %_DEST%\lib\libunopkgapp.so -..\%__SRC%\bin\rebasegui.exe %_DEST%\bin\rebasegui.exe -..\%__SRC%\bin\rebaseoo.exe %_DEST%\bin\rebaseoo.exe ..\%__SRC%\bin\pagein %_DEST%\bin\pagein ..\%__SRC%\misc\pagein-* %_DEST%\bin\pagein-* diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh index 0543346c67..caed192e6b 100755 --- a/desktop/scripts/soffice.sh +++ b/desktop/scripts/soffice.sh @@ -39,8 +39,6 @@ export SAL_ENABLE_FILE_LOCKING # working on your system. # SAL_NOOPENGL=true; export SAL_NOOPENGL -unset XENVIRONMENT - # uncomment line below to disable anti aliasing of fonts # SAL_ANTIALIAS_DISABLE=true; export SAL_ANTIALIAS_DISABLE diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx index b626141e49..5eca4324cf 100644 --- a/desktop/source/deployment/misc/dp_misc.cxx +++ b/desktop/source/deployment/misc/dp_misc.cxx @@ -58,7 +58,7 @@ #define UNICODE #define _UNICODE #define WIN32_LEAN_AND_MEAN -#include <Windows.h> +#include <windows.h> #endif using namespace ::com::sun::star; diff --git a/desktop/util/ooverinfo.rc b/desktop/util/ooverinfo.rc index d434bc4fc6..53b20852c4 100644 --- a/desktop/util/ooverinfo.rc +++ b/desktop/util/ooverinfo.rc @@ -34,7 +34,7 @@ // version information // ----------------------------------------------------------------------- -VS_VERSION_INFO versioninfo +VS_VERSION_INFO VERSIONINFO FILEVERSION VERSION, SUBVERSION, VERVARIANT, VER_COUNT PRODUCTVERSION VERSION, SUBVERSION, VERVARIANT, VER_COUNT FILEFLAGSMASK 0x3F diff --git a/desktop/win32/source/QuickStart/QuickStart.cpp b/desktop/win32/source/QuickStart/QuickStart.cpp index 204b3d3a06..7bf32ba794 100755 --- a/desktop/win32/source/QuickStart/QuickStart.cpp +++ b/desktop/win32/source/QuickStart/QuickStart.cpp @@ -2,7 +2,7 @@ // QuickStart.cpp : Defines the entry point for the application. // -#include "stdafx.h" +#include "StdAfx.h" #include "resource.h" #include <systools/win32/uwinapi.h> #include <stdio.h> diff --git a/desktop/win32/source/applauncher/ooo/verinfo.rc b/desktop/win32/source/applauncher/ooo/verinfo.rc index 61e9147a4a..c5fcc811d0 100755 --- a/desktop/win32/source/applauncher/ooo/verinfo.rc +++ b/desktop/win32/source/applauncher/ooo/verinfo.rc @@ -34,11 +34,11 @@ // version information // ----------------------------------------------------------------------- -VS_VERSION_INFO versioninfo - fileversion VERSION, SUBVERSION, VERVARIANT, VER_COUNT - productversion VERSION, SUBVERSION, VERVARIANT, VER_COUNT - fileflagsmask 0x3F - fileflags +VS_VERSION_INFO VERSIONINFO + FILEVERSION VERSION, SUBVERSION, VERVARIANT, VER_COUNT + PRODUCTVERSION VERSION, SUBVERSION, VERVARIANT, VER_COUNT + FILEFLAGSMASK 0x3F + FILEFLAGS #if defined(DEBUG) VS_FF_DEBUG | #endif @@ -46,26 +46,26 @@ VS_VERSION_INFO versioninfo VS_FF_PRERELEASE | #endif 0 - fileos VOS_NT_WINDOWS32 - filetype VFT_APP + FILEOS VOS_NT_WINDOWS32 + FILETYPE VFT_APP { - block "StringFileInfo" + BLOCK "StringFileInfo" { - block "040904E4" + BLOCK "040904E4" { // International StringTable - value "CompanyName", "The Document Foundation\0" - value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0" - value "FileVersion", PPS(VER_LEVEL) "\0" - value "ProductVersion", PPS(VER_LEVEL) "\0" - value "OriginalFilename", PPS(RES_APP_NAME) ".exe\0" - value "InternalName", PPS(RES_APP_NAME) "\0" - value "LegalCopyright", S_CRIGHT " Oracle and/or its affiliates. All rights reserved.\0" + VALUE "CompanyName", "The Document Foundation\0" + VALUE "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0" + VALUE "FileVersion", PPS(VER_LEVEL) "\0" + VALUE "ProductVersion", PPS(VER_LEVEL) "\0" + VALUE "OriginalFilename", PPS(RES_APP_NAME) ".exe\0" + VALUE "InternalName", PPS(RES_APP_NAME) "\0" + VALUE "LegalCopyright", S_CRIGHT " Oracle and/or its affiliates. All rights reserved.\0" } } - block "VarFileInfo" + BLOCK "VarFileInfo" { - value "Translation", 0x0409, 1252 + VALUE "Translation", 0x0409, 1252 } } diff --git a/desktop/win32/source/rebase/Resource.h b/desktop/win32/source/rebase/Resource.h deleted file mode 100755 index 8c892111c9..0000000000 --- a/desktop/win32/source/rebase/Resource.h +++ /dev/null @@ -1,41 +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 _RESOURCE_H -#define _RESOURCE_H - -#define IDS_APP_TITLE 10 -#define IDS_MSG_OPTIMIZED_FOR_CLIENT 11 -#define IDS_MSG_OPTIMIZED_FOR_SERVER 12 -#define IDS_MSG_NO_INSTALLATION_FOUND 13 - -#define IDI_REBASEGUI 99 - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/win32/source/rebase/makefile.mk b/desktop/win32/source/rebase/makefile.mk deleted file mode 100755 index 724ea0edf4..0000000000 --- a/desktop/win32/source/rebase/makefile.mk +++ /dev/null @@ -1,89 +0,0 @@ -#************************************************************************* -# -# 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. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=desktop -TARGET=rebasegui -LIBTARGET=NO -TARGETTYPE=GUI -UWINAPILIB= - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -OBJFILES = \ - $(OBJ)$/rebase.obj \ - $(OBJ)$/rebasegui.obj - -ULFFILES= rebasegui.ulf - -.IF "$(WITH_LANG)"!="" -ULFDIR:=$(COMMONMISC)$/$(TARGET) -.ELSE # "$(WITH_LANG)"!="" -ULFDIR:=. -.ENDIF # "$(WITH_LANG)"!="" - -RCFILES= $(RES)$/$(TARGET).rc - -# --- Targets ------------------------------------------------------ - -APP1NOSAL= TRUE -APP1TARGET= rebaseoo - -APP1STDLIBS= $(SHELL32LIB) $(SOLARLIBDIR)$/pathutils-obj.obj -.IF "$(COM)"=="GCC" - APP1STDLIBS+=$(PSDK_HOME)$/lib$/imagehlp.lib -.ELSE - APP1STDLIBS+=imagehlp.lib -.ENDIF - -APP1OBJS= $(OBJ)$/rebase.obj - -APP1RPATH= BRAND - -APP2NOSAL= TRUE -APP2TARGET= rebasegui -APP2STDLIBS= $(SHELL32LIB) $(SOLARLIBDIR)$/pathutils-obj.obj - -APP2OBJS= $(OBJ)$/rebasegui.obj - -APP2DEF= $(MISC)$/$(TARGET).def -APP2RPATH= BRAND - -APP2RES= $(RES)$/$(TARGET).res -APP2NOSVRES= $(RES)$/$(TARGET).res - -# --- setup -------------------------------------------------------------- - -.INCLUDE : target.mk - -$(RCFILES) : $(ULFDIR)$/rebasegui.ulf makefile.mk rcfooter.txt rcheader.txt rctmpl.txt - $(LNGCONVEX) -ulf $(ULFDIR)$/rebasegui.ulf -rc $(RCFILES) -rct rctmpl.txt -rch rcheader.txt -rcf rcfooter.txt diff --git a/desktop/win32/source/rebase/rcfooter.txt b/desktop/win32/source/rebase/rcfooter.txt deleted file mode 100755 index 3237729437..0000000000 --- a/desktop/win32/source/rebase/rcfooter.txt +++ /dev/null @@ -1,2 +0,0 @@ - -// The end diff --git a/desktop/win32/source/rebase/rcheader.txt b/desktop/win32/source/rebase/rcheader.txt deleted file mode 100755 index 56afc53779..0000000000 --- a/desktop/win32/source/rebase/rcheader.txt +++ /dev/null @@ -1,39 +0,0 @@ -#if defined(_MSC_VER) && (_MSC_VER < 1500) -#include <winres.h> -#else -#define WINVER 0x0500 -#include <winresrc.h> -#define IDC_STATIC (-1) -#endif -#include "resource.h" - -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,1,1,0 - PRODUCTVERSION 1,1,1,0 - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x9L -#else - FILEFLAGS 0x8L -#endif - FILEOS 0x40004L - FILETYPE 0x1L - FILESUBTYPE 0x0L -BEGIN - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - diff --git a/desktop/win32/source/rebase/rctmpl.txt b/desktop/win32/source/rebase/rctmpl.txt deleted file mode 100755 index 97a2775e9b..0000000000 --- a/desktop/win32/source/rebase/rctmpl.txt +++ /dev/null @@ -1,9 +0,0 @@ -// String Table - -STRINGTABLE DISCARDABLE -BEGIN - IDS_APP_TITLE %APP_TITLE% - IDS_MSG_OPTIMIZED_FOR_CLIENT %MSG_OPTIMIZED_FOR_CLIENT% - IDS_MSG_OPTIMIZED_FOR_SERVER %MSG_OPTIMIZED_FOR_SERVER% - IDS_MSG_NO_INSTALLATION_FOUND %MSG_NO_INSTALLATION_FOUND% -END diff --git a/desktop/win32/source/rebase/rebase.cxx b/desktop/win32/source/rebase/rebase.cxx deleted file mode 100644 index e712c8d548..0000000000 --- a/desktop/win32/source/rebase/rebase.cxx +++ /dev/null @@ -1,191 +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. - * - ************************************************************************/ - -#include "precompiled_desktop.hxx" -#define UNICODE -#define _UNICODE - -#define WIN32_LEAN_AND_MEAN -#if defined _MSC_VER -#pragma warning(push, 1) -#endif -#include <windows.h> -#include <shellapi.h> -#include <imagehlp.h> -#include <wchar.h> -#if defined _MSC_VER -#pragma warning(pop) -#endif - -#include <time.h> -#include "sal/config.h" -#include <sal/macros.h> -#include "tools/pathutils.hxx" - -#define MY_LENGTH(s) (sizeof (s) / sizeof *(s) - 1) -#define MY_STRING(s) (s), MY_LENGTH(s) - -const int FORMAT_MESSAGE_SIZE = 4096; -const DWORD PE_Signature = 0x00004550; -const DWORD BASEVIRTUALADDRESS = 0x10000000; - -namespace -{ - -bool IsValidHandle( HANDLE handle ) -{ - return ((NULL != handle) && (INVALID_HANDLE_VALUE != handle)); -} - -void fail() -{ - LPWSTR buf = NULL; - FormatMessageW( - FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL, - GetLastError(), 0, reinterpret_cast< LPWSTR >(&buf), 0, NULL); - MessageBoxW(NULL, buf, NULL, MB_OK | MB_ICONERROR); - LocalFree(buf); - TerminateProcess(GetCurrentProcess(), 255); -} - -bool rebaseImage( wchar_t* pszFilePath, ULONG nNewImageBase) -{ - ULONG ulOldImageSize; - ULONG_PTR lpOldImageBase; - ULONG ulNewImageSize; - ULONG_PTR lpNewImageBase = nNewImageBase; - ULONG ulDateTimeStamp = 0; - bool bResult(false); - - char cszFilePath[_MAX_PATH+1] = {0}; - int nResult = WideCharToMultiByte(CP_ACP, 0, pszFilePath, -1, cszFilePath, _MAX_PATH, NULL, NULL); - - if (nResult != 0) - { - BOOL bResult = ReBaseImage( - cszFilePath, - "", - TRUE, - FALSE, - FALSE, - 0, - &ulOldImageSize, - &lpOldImageBase, - &ulNewImageSize, - &lpNewImageBase, - ulDateTimeStamp ); - } - - return bResult; -} - -wchar_t* getBrandPath(wchar_t * path) -{ - DWORD n = GetModuleFileNameW(NULL, path, MAX_PATH); - if (n == 0 || n >= MAX_PATH) { - exit(EXIT_FAILURE); - } - return tools::filename(path); -} - -void rebaseImagesInFolder( wchar_t* pszFolder, DWORD nNewImageBase ) -{ - wchar_t szPattern[MAX_PATH]; - wchar_t *lpLastSlash = wcsrchr( pszFolder, '\\' ); - if ( lpLastSlash ) - { - size_t len = lpLastSlash - pszFolder + 1; - wcsncpy( szPattern, pszFolder, len ); - wcsncpy( szPattern + len, TEXT("*.dll"), SAL_N_ELEMENTS(szPattern) - len ); - } - - WIN32_FIND_DATA aFindFileData; - HANDLE hFind = FindFirstFile( szPattern, &aFindFileData ); - - if ( IsValidHandle(hFind) ) - { - BOOL fSuccess = false; - - do - { - wchar_t szLibFilePath[MAX_PATH]; - wchar_t *lpLastSlash = wcsrchr( pszFolder, '\\' ); - if ( lpLastSlash ) - { - size_t len = lpLastSlash - pszFolder + 1; - wcsncpy( szLibFilePath, pszFolder, len ); - wcsncpy( szLibFilePath + len, aFindFileData.cFileName, SAL_N_ELEMENTS(szLibFilePath) - len ); - } - - rebaseImage( szLibFilePath, nNewImageBase ); - fSuccess = FindNextFile( hFind, &aFindFileData ); - } - while ( fSuccess ); - - FindClose( hFind ); - } -} - -} - -extern "C" int APIENTRY WinMain( HINSTANCE, HINSTANCE, LPSTR, int ) -{ - wchar_t path[MAX_PATH]; - - wchar_t * pathEnd = getBrandPath(path); - - if (tools::buildPath(path, path, pathEnd, MY_STRING(L"")) == NULL) - fail(); - rebaseImagesInFolder(path, BASEVIRTUALADDRESS); - - if (tools::buildPath(path, path, pathEnd, MY_STRING(L"..\\basis-link")) == NULL) - fail(); - pathEnd = tools::resolveLink(path); - - if ( pathEnd == NULL ) - return 0; - - if (tools::buildPath(path, path, pathEnd, MY_STRING(L"\\program\\")) == NULL) - fail(); - rebaseImagesInFolder(path, BASEVIRTUALADDRESS); - - if (tools::buildPath(path, path, pathEnd, MY_STRING(L"\\ure-link")) == NULL) - fail(); - pathEnd = tools::resolveLink(path); - - if ( pathEnd == NULL ) - return 0; - - if (tools::buildPath(path, path, pathEnd, MY_STRING(L"\\bin\\")) == NULL) - fail(); - rebaseImagesInFolder(path, BASEVIRTUALADDRESS); - - return 0; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/win32/source/rebase/rebasegui.cxx b/desktop/win32/source/rebase/rebasegui.cxx deleted file mode 100644 index e1bb148c2b..0000000000 --- a/desktop/win32/source/rebase/rebasegui.cxx +++ /dev/null @@ -1,200 +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. - * - ************************************************************************/ - -#include "precompiled_desktop.hxx" - -#define UNICODE 1 -#define _UNICODE 1 - -#ifndef _WINDOWS_ -# define WIN32_LEAN_AND_MEAN -#if defined _MSC_VER -#pragma warning(push, 1) -#endif -# include <windows.h> -# include <shellapi.h> -# include <wchar.h> -#if defined _MSC_VER -#pragma warning(pop) -#endif -#endif - -#include "Resource.h" -#include <time.h> -#include "sal/config.h" -#include "tools/pathutils.hxx" - -const DWORD PE_Signature = 0x00004550; - -#define MY_LENGTH(s) (sizeof (s) / sizeof *(s) - 1) -#define MY_STRING(s) (s), MY_LENGTH(s) -#define MAX_STR_CAPTION 256 -#define MAX_TEXT_LENGTH 1024 - -static void failPath(wchar_t* pszAppTitle, wchar_t* pszMsg) -{ - MessageBoxW(NULL, pszMsg, pszAppTitle, MB_OK | MB_ICONERROR); - TerminateProcess(GetCurrentProcess(), 255); -} - -static void fail() -{ - LPWSTR buf = NULL; - FormatMessageW( - FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL, - GetLastError(), 0, reinterpret_cast< LPWSTR >(&buf), 0, NULL); - MessageBoxW(NULL, buf, NULL, MB_OK | MB_ICONERROR); - LocalFree(buf); - TerminateProcess(GetCurrentProcess(), 255); -} - -static LPVOID getVirtualBaseAddress( wchar_t* pszFilePath ) -{ - HANDLE hFile; - HANDLE hFileMapping; - LPVOID lpFileBase = 0; - PIMAGE_DOS_HEADER lpDosHeader; - PIMAGE_NT_HEADERS lpNTHeader; - - hFile = CreateFile(pszFilePath, - GENERIC_READ, FILE_SHARE_READ, NULL, - OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, - 0); - - if ( hFile == INVALID_HANDLE_VALUE ) - { - return NULL; - } - - hFileMapping = CreateFileMapping(hFile, NULL, PAGE_READONLY, 0, 0, NULL); - if ( hFileMapping == 0 ) - { - CloseHandle(hFile); - return NULL; - } - - lpFileBase = MapViewOfFile(hFileMapping, FILE_MAP_READ, 0, 0, 0); - if ( lpFileBase == 0 ) - { - CloseHandle(hFileMapping); - CloseHandle(hFile); - return NULL; - } - - lpDosHeader = (PIMAGE_DOS_HEADER)lpFileBase; - if ( lpDosHeader->e_magic == IMAGE_DOS_SIGNATURE ) - { - lpNTHeader = (PIMAGE_NT_HEADERS)((char*)lpDosHeader + lpDosHeader->e_lfanew); - if (lpNTHeader->Signature == PE_Signature ) - lpFileBase = reinterpret_cast<LPVOID>( lpNTHeader->OptionalHeader.ImageBase ); - } - - UnmapViewOfFile(lpFileBase); - CloseHandle(hFileMapping); - CloseHandle(hFile); - - return lpFileBase; -} - -static bool checkImageVirtualBaseAddress(wchar_t* pszFilePath, LPVOID lpVBA) -{ - LPVOID lpImageVBA = getVirtualBaseAddress(pszFilePath); - if ( lpImageVBA == lpVBA ) - return true; - else - return false; -} - -static wchar_t* getBrandPath(wchar_t * pszPath) -{ - DWORD n = GetModuleFileNameW(NULL, pszPath, MAX_PATH); - if (n == 0 || n >= MAX_PATH) { - exit(EXIT_FAILURE); - } - return tools::filename(pszPath); -} - -extern "C" int APIENTRY WinMain( HINSTANCE hInst, HINSTANCE, LPSTR, int ) -{ - wchar_t* pAppTitle = new wchar_t[ MAX_STR_CAPTION ]; - pAppTitle[0] = '\0'; - LoadString( hInst, IDS_APP_TITLE, pAppTitle, MAX_STR_CAPTION ); - - wchar_t* pTextServer = new wchar_t[ MAX_TEXT_LENGTH ]; - pTextServer[0] = '\0'; - LoadString( hInst, IDS_MSG_OPTIMIZED_FOR_SERVER, pTextServer, MAX_TEXT_LENGTH ); - - wchar_t* pTextClient = new wchar_t[ MAX_TEXT_LENGTH ]; - pTextClient[0] = '\0'; - LoadString( hInst, IDS_MSG_OPTIMIZED_FOR_CLIENT, pTextClient, MAX_TEXT_LENGTH ); - - wchar_t* pTextNoInstallation = new wchar_t[ MAX_TEXT_LENGTH ]; - pTextNoInstallation[0] = '\0'; - LoadString( hInst, IDS_MSG_NO_INSTALLATION_FOUND, pTextNoInstallation, MAX_TEXT_LENGTH ); - - LPVOID VBA = (void*)0x10000000; - wchar_t path[MAX_PATH]; - - wchar_t * pathEnd = getBrandPath(path); - - if (tools::buildPath(path, path, pathEnd, MY_STRING(L"libxml2.dll")) == NULL) - fail(); - bool bFast = checkImageVirtualBaseAddress(path, VBA); - - if (tools::buildPath(path, path, pathEnd, MY_STRING(L"..\\basis-link")) == NULL) - fail(); - pathEnd = tools::resolveLink(path); - - if (pathEnd == NULL) - failPath(pAppTitle, pTextNoInstallation); - - if (tools::buildPath(path, path, pathEnd, MY_STRING(L"\\program\\vclmi.dll")) == NULL) - fail(); - bFast &= checkImageVirtualBaseAddress(path, VBA); - - if (tools::buildPath(path, path, pathEnd, MY_STRING(L"\\ure-link")) == NULL) - fail(); - pathEnd = tools::resolveLink(path); - - if (pathEnd == NULL) - failPath(pAppTitle, pTextNoInstallation); - - if (tools::buildPath(path, path, pathEnd, MY_STRING(L"\\bin\\sal3.dll")) == NULL) - fail(); - bFast &= checkImageVirtualBaseAddress(path, VBA); - - const wchar_t* pOutput = pTextClient; - if (!bFast) - pOutput = pTextServer; - - MessageBoxW( NULL, pOutput, pAppTitle, MB_OK ); - - return 0; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/win32/source/rebase/rebasegui.ulf b/desktop/win32/source/rebase/rebasegui.ulf deleted file mode 100755 index ee6b6e828a..0000000000 --- a/desktop/win32/source/rebase/rebasegui.ulf +++ /dev/null @@ -1,11 +0,0 @@ -[%APP_TITLE%] -en-US = "Installation Status" - -[%MSG_OPTIMIZED_FOR_CLIENT%] -en-US = "Installation is optimized for clients." - -[%MSG_OPTIMIZED_FOR_SERVER%] -en-US = "Installation is optimized for servers." - -[%MSG_NO_INSTALLATION_FOUND%] -en-US = "Cannot find Office installation." diff --git a/desktop/win32/source/setup/rcheader.txt b/desktop/win32/source/setup/rcheader.txt index 9a59ad7f64..1945c499fe 100644 --- a/desktop/win32/source/setup/rcheader.txt +++ b/desktop/win32/source/setup/rcheader.txt @@ -7,7 +7,7 @@ #define CB_ADDSTRING (WM_USER+3) #define IDC_STATIC (-1) #endif -#include "resource.h" +#include "Resource.h" ///////////////////////////////////////////////////////////////////////////// // diff --git a/desktop/win32/source/setup/setup.cpp b/desktop/win32/source/setup/setup.cpp index 81e81a6f9f..a8584f53f0 100644 --- a/desktop/win32/source/setup/setup.cpp +++ b/desktop/win32/source/setup/setup.cpp @@ -43,13 +43,13 @@ #include <time.h> #include <mbctype.h> #include <locale.h> -#include <Msiquery.h> -#include <MsiDefs.h> +#include <msiquery.h> +#include <msidefs.h> #include "strsafe.h" #include "setup.hxx" -#include "resource.h" +#include "Resource.h" //-------------------------------------------------------------------------- @@ -88,7 +88,7 @@ #define RUNTIME_X64_NAME TEXT( "redist\\vcredist_x64.exe" ) #define RUNTIME_X86_NAME TEXT( "redist\\vcredist_x86.exe" ) #define PRODUCTCODE_X86 TEXT( "{1F1C2DFC-2D24-3E06-BCB8-725134ADF989}" ) -#define PRODUCTCODE_X64 TEXT( "{350AA351-21FA-3270-8B7A-835434E766AD}" ) +#define PRODUCTCODE_X64 TEXT( "{4B6C7001-C7D6-3710-913E-5BC23FCE91E6}" ) #define MSIAPI_DllGetVersion "DllGetVersion" #define ADVAPI32API_CheckTokenMembership "CheckTokenMembership" diff --git a/editeng/source/editeng/eehtml.cxx b/editeng/source/editeng/eehtml.cxx index 351627674f..0071d2bc2e 100644 --- a/editeng/source/editeng/eehtml.cxx +++ b/editeng/source/editeng/eehtml.cxx @@ -52,21 +52,20 @@ #define STYLE_PRE 101 EditHTMLParser::EditHTMLParser( SvStream& rIn, const String& rBaseURL, SvKeyValueIterator* pHTTPHeaderAttrs ) - : HTMLParser( rIn, true ) - , aBaseURL( rBaseURL ) + : HTMLParser( rIn, true ), + aBaseURL( rBaseURL ), + pImpEditEngine(NULL), + pCurAnchor(NULL), + bInPara(false), + bWasInPara(false), + bFieldsInserted(false), + bInTitle(false), + nInTable(0), + nInCell(0), + nDefListLevel(0), + nBulletLevel(0), + nNumberingLevel(0) { - pImpEditEngine = 0; - pCurAnchor = 0; - bInPara = sal_False; - bWasInPara = sal_False; - nInTable = 0; - nInCell = 0; - bInTitle = sal_False; - nDefListLevel = 0; - nBulletLevel = 0; - nNumberingLevel = 0; - bFieldsInserted = sal_False; - DBG_ASSERT( RTL_TEXTENCODING_DONTKNOW == GetSrcEncoding( ), "EditHTMLParser::EditHTMLParser: Where does the encoding come from?" ); DBG_ASSERT( !IsSwitchToUCS2(), "EditHTMLParser::::EditHTMLParser: Switch to UCS2?" ); @@ -75,7 +74,7 @@ EditHTMLParser::EditHTMLParser( SvStream& rIn, const String& rBaseURL, SvKeyValu SetSrcEncoding( GetExtendedCompatibilityTextEncoding( RTL_TEXTENCODING_ISO_8859_1 ) ); // If the file starts with a BOM, switch to UCS2. - SetSwitchToUCS2( sal_True ); + SetSwitchToUCS2( true ); if ( pHTTPHeaderAttrs ) SetEncodingByHTTPHeader( pHTTPHeaderAttrs ); @@ -128,24 +127,24 @@ void EditHTMLParser::NextToken( int nToken ) { case HTML_META: { - const HTMLOptions *_pOptions = GetOptions(); - sal_uInt16 nArrLen = _pOptions->Count(); - sal_Bool bEquiv = sal_False; - for ( sal_uInt16 i = 0; i < nArrLen; i++ ) + const HTMLOptions& aOptions = GetOptions(); + size_t nArrLen = aOptions.size(); + bool bEquiv = false; + for ( size_t i = 0; i < nArrLen; i++ ) { - const HTMLOption *pOption = (*_pOptions)[i]; - switch( pOption->GetToken() ) + const HTMLOption& aOption = aOptions[i]; + switch( aOption.GetToken() ) { case HTML_O_HTTPEQUIV: { - bEquiv = sal_True; + bEquiv = true; } break; case HTML_O_CONTENT: { if ( bEquiv ) { - rtl_TextEncoding eEnc = GetEncodingByMIME( pOption->GetString() ); + rtl_TextEncoding eEnc = GetEncodingByMIME( aOption.GetString() ); if ( eEnc != RTL_TEXTENCODING_DONTKNOW ) SetSrcEncoding( eEnc ); } @@ -158,11 +157,11 @@ void EditHTMLParser::NextToken( int nToken ) break; case HTML_PLAINTEXT_ON: case HTML_PLAINTEXT2_ON: - bInPara = sal_True; + bInPara = true; break; case HTML_PLAINTEXT_OFF: case HTML_PLAINTEXT2_OFF: - bInPara = sal_False; + bInPara = false; break; case HTML_LINEBREAK: @@ -195,7 +194,7 @@ void EditHTMLParser::NextToken( int nToken ) if (!bInTitle) { if ( !bInPara ) - StartPara( sal_False ); + StartPara( false ); String aText = aToken; if ( aText.Len() && ( aText.GetChar( 0 ) == ' ' ) @@ -244,13 +243,13 @@ void EditHTMLParser::NextToken( int nToken ) case HTML_PARABREAK_ON: if( bInPara && HasTextInCurrentPara() ) - EndPara( sal_True ); - StartPara( sal_True ); + EndPara( true ); + StartPara( true ); break; case HTML_PARABREAK_OFF: if( bInPara ) - EndPara( sal_True ); + EndPara( true ); break; case HTML_HEAD1_ON: @@ -279,7 +278,7 @@ void EditHTMLParser::NextToken( int nToken ) case HTML_XMP_ON: case HTML_LISTING_ON: { - StartPara( sal_True ); + StartPara( true ); ImpSetStyleSheet( STYLE_PRE ); } break; @@ -318,10 +317,10 @@ void EditHTMLParser::NextToken( int nToken ) case HTML_ORDERLIST_ON: case HTML_UNORDERLIST_ON: { - sal_Bool bHasText = HasTextInCurrentPara(); + bool bHasText = HasTextInCurrentPara(); if ( bHasText ) ImpInsertParaBreak(); - StartPara( sal_False ); + StartPara( false ); } break; @@ -337,7 +336,7 @@ void EditHTMLParser::NextToken( int nToken ) case HTML_DD_OFF: case HTML_DT_OFF: case HTML_ORDERLIST_OFF: - case HTML_UNORDERLIST_OFF: EndPara( sal_False ); + case HTML_UNORDERLIST_OFF: EndPara( false ); break; case HTML_TABLEROW_ON: @@ -353,10 +352,10 @@ void EditHTMLParser::NextToken( int nToken ) break; case HTML_TITLE_ON: - bInTitle = sal_True; + bInTitle = true; break; case HTML_TITLE_OFF: - bInTitle = sal_False; + bInTitle = false; break; // globals @@ -524,7 +523,6 @@ void EditHTMLParser::ImpInsertParaBreak() pImpEditEngine->aImportHdl.Call( &aImportInfo ); } aCurSel = pImpEditEngine->ImpInsertParaBreak( aCurSel ); - nLastAction = ACTION_INSERTPARABRK; } void EditHTMLParser::ImpSetAttribs( const SfxItemSet& rItems, EditSelection* pSel ) @@ -683,7 +681,6 @@ void EditHTMLParser::ImpInsertText( const String& rText ) } aCurSel = pImpEditEngine->ImpInsertText( aCurSel, aText ); - nLastAction = ACTION_INSERTTEXT; } void EditHTMLParser::SkipGroup( int nEndToken ) @@ -710,25 +707,24 @@ void EditHTMLParser::SkipGroup( int nEndToken ) } } -void EditHTMLParser::StartPara( sal_Bool bReal ) +void EditHTMLParser::StartPara( bool bReal ) { if ( bReal ) { - const HTMLOptions *_pOptions = GetOptions(); - sal_uInt16 nArrLen = _pOptions->Count(); + const HTMLOptions& aOptions = GetOptions(); SvxAdjust eAdjust = SVX_ADJUST_LEFT; - for ( sal_uInt16 i = 0; i < nArrLen; i++ ) + for ( size_t i = 0, n = aOptions.size(); i < n; ++i ) { - const HTMLOption *pOption = (*_pOptions)[i]; - switch( pOption->GetToken() ) + const HTMLOption& aOption = aOptions[i]; + switch( aOption.GetToken() ) { case HTML_O_ALIGN: { - if ( pOption->GetString().CompareIgnoreCaseToAscii( OOO_STRING_SVTOOLS_HTML_AL_right ) == COMPARE_EQUAL ) + if ( aOption.GetString().CompareIgnoreCaseToAscii( OOO_STRING_SVTOOLS_HTML_AL_right ) == COMPARE_EQUAL ) eAdjust = SVX_ADJUST_RIGHT; - else if ( pOption->GetString().CompareIgnoreCaseToAscii( OOO_STRING_SVTOOLS_HTML_AL_middle ) == COMPARE_EQUAL ) + else if ( aOption.GetString().CompareIgnoreCaseToAscii( OOO_STRING_SVTOOLS_HTML_AL_middle ) == COMPARE_EQUAL ) eAdjust = SVX_ADJUST_CENTER; - else if ( pOption->GetString().CompareIgnoreCaseToAscii( OOO_STRING_SVTOOLS_HTML_AL_center ) == COMPARE_EQUAL ) + else if ( aOption.GetString().CompareIgnoreCaseToAscii( OOO_STRING_SVTOOLS_HTML_AL_center ) == COMPARE_EQUAL ) eAdjust = SVX_ADJUST_CENTER; else eAdjust = SVX_ADJUST_LEFT; @@ -740,33 +736,33 @@ void EditHTMLParser::StartPara( sal_Bool bReal ) aItemSet.Put( SvxAdjustItem( eAdjust, EE_PARA_JUST ) ); ImpSetAttribs( aItemSet ); } - bInPara = sal_True; + bInPara = true; } -void EditHTMLParser::EndPara( sal_Bool ) +void EditHTMLParser::EndPara( bool ) { if ( bInPara ) { - sal_Bool bHasText = HasTextInCurrentPara(); + bool bHasText = HasTextInCurrentPara(); if ( bHasText ) ImpInsertParaBreak(); } - bInPara = sal_False; + bInPara = false; } -sal_Bool EditHTMLParser::ThrowAwayBlank() +bool EditHTMLParser::ThrowAwayBlank() { // A blank must be thrown away if the new text begins with a Blank and // if the current paragraph is empty or ends with a Blank... ContentNode* pNode = aCurSel.Max().GetNode(); if ( pNode->Len() && ( pNode->GetChar( pNode->Len()-1 ) != ' ' ) ) - return sal_False; - return sal_True; + return false; + return true; } -sal_Bool EditHTMLParser::HasTextInCurrentPara() +bool EditHTMLParser::HasTextInCurrentPara() { - return aCurSel.Max().GetNode()->Len() ? sal_True : sal_False; + return aCurSel.Max().GetNode()->Len() ? true : false; } void EditHTMLParser::AnchorStart() @@ -774,18 +770,16 @@ void EditHTMLParser::AnchorStart() // ignore anchor in anchor if ( !pCurAnchor ) { - const HTMLOptions* _pOptions = GetOptions(); - sal_uInt16 nArrLen = _pOptions->Count(); - + const HTMLOptions& aOptions = GetOptions(); String aRef; - for ( sal_uInt16 i = 0; i < nArrLen; i++ ) + for ( size_t i = 0, n = aOptions.size(); i < n; ++i ) { - const HTMLOption* pOption = (*_pOptions)[i]; - switch( pOption->GetToken() ) + const HTMLOption& aOption = aOptions[i]; + switch( aOption.GetToken() ) { case HTML_O_HREF: - aRef = pOption->GetString(); + aRef = aOption.GetString(); break; } } @@ -813,9 +807,9 @@ void EditHTMLParser::AnchorEnd() // Insert as URL-Field... SvxFieldItem aFld( SvxURLField( pCurAnchor->aHRef, pCurAnchor->aText, SVXURLFORMAT_REPR ), EE_FEATURE_FIELD ); aCurSel = pImpEditEngine->InsertField( aCurSel, aFld ); - bFieldsInserted = sal_True; + bFieldsInserted = true; delete pCurAnchor; - pCurAnchor = 0; + pCurAnchor = NULL; if ( pImpEditEngine->aImportHdl.IsSet() ) { @@ -828,7 +822,7 @@ void EditHTMLParser::AnchorEnd() void EditHTMLParser::HeadingStart( int nToken ) { bWasInPara = bInPara; - StartPara( sal_False ); + StartPara( false ); if ( bWasInPara && HasTextInCurrentPara() ) ImpInsertParaBreak(); @@ -841,13 +835,13 @@ void EditHTMLParser::HeadingStart( int nToken ) void EditHTMLParser::HeadingEnd( int ) { - EndPara( sal_False ); + EndPara( false ); ImpSetStyleSheet( 0 ); if ( bWasInPara ) { - bInPara = sal_True; - bWasInPara = sal_False; + bInPara = true; + bWasInPara = false; } } diff --git a/editeng/source/editeng/eehtml.hxx b/editeng/source/editeng/eehtml.hxx index 43d55cdfd8..a9a940b0c1 100644 --- a/editeng/source/editeng/eehtml.hxx +++ b/editeng/source/editeng/eehtml.hxx @@ -53,29 +53,26 @@ private: ImpEditEngine* pImpEditEngine; AnchorInfo* pCurAnchor; - sal_Bool bInPara; - sal_Bool bWasInPara; // Remember bInPara before HeadingStart, because afterwards it will be gone. - sal_Bool bFieldsInserted; + bool bInPara:1; + bool bWasInPara:1; // Remember bInPara before HeadingStart, because afterwards it will be gone. + bool bFieldsInserted:1; + bool bInTitle:1; + sal_uInt8 nInTable; sal_uInt8 nInCell; - sal_Bool bInTitle; - sal_uInt8 nDefListLevel; sal_uInt8 nBulletLevel; sal_uInt8 nNumberingLevel; - sal_uInt8 nLastAction; - - void StartPara( sal_Bool bReal ); - void EndPara( sal_Bool bReal ); + void StartPara( bool bReal ); + void EndPara( bool bReal ); void AnchorStart(); void AnchorEnd(); void HeadingStart( int nToken ); void HeadingEnd( int nToken ); void SkipGroup( int nEndToken ); - sal_Bool ThrowAwayBlank(); - sal_Bool HasTextInCurrentPara(); - void ProcessUnknownControl( sal_Bool bOn ); + bool ThrowAwayBlank(); + bool HasTextInCurrentPara(); void ImpInsertParaBreak(); void ImpInsertText( const String& rText ); diff --git a/scripting/util/ant.pmk b/scripting/util/ant.pmk deleted file mode 100755 index 3d605c8d17..0000000000 --- a/scripting/util/ant.pmk +++ /dev/null @@ -1,55 +0,0 @@ -#************************************************************************* -# -# 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. -# -#************************************************************************* - -JARFILES*=../util/ant.jar - -# needs jdk1.2 ! -JAVAC_LIB:=$(JAVA_HOME)$/lib$/tools.jar - -STARDEP=@echo ANTBuild - -OTHER=antbuild -OTHERTARRGET=OTHERTARGET -SOLARDOCDIR=$(SOLARVER)$/$(INPATH)$/doc$(EXT_UPDMINOR) - - -ANT=java -Xmx128m org.apache.tools.ant.Main -.IF "$(ANT_BUILDFILE)" =="" -ANT_BUILDFILE=build.xml -.ENDIF -ANTFLAGS!:=-Dprj=$(PRJ) -Dant.home=$(SOLARBINDIR)$/.. -Dsolar.doc=$(SOLARDOCDIR) -f $(ANT_BUILDFILE) $(ANTFLAGS) -Djardir=$(JARDIR) -Dsolar.jar=$(SOLARBINDIR) -Dout=$(OUT) -Dinpath=$(INPATH) - -.INCLUDE : ../util/target.pmk - -ANT_CLASSPATH:=..$/util$/xerces.jar$(PATH_SEPERATOR)..$/util$/ant.jar$(PATH_SEPERATOR)..$/util$/junit.jar -CLASSPATH!:=$(ANT_CLASSPATH)$(CLASSPATH) -.EXPORT : CLASSPATH - -antbuild .PHONY: - $(ANT) $(ANTFLAGS) - - diff --git a/scripting/util/makefile.pmk b/scripting/util/makefile.pmk deleted file mode 100755 index e588b95fdb..0000000000 --- a/scripting/util/makefile.pmk +++ /dev/null @@ -1,43 +0,0 @@ -#************************************************************************* -# -# 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. -# -#************************************************************************* - -# --- Settings ----------------------------------------------------- -.INCLUDE : settings.mk - -.IF "$(J2EE_HOME)"=="" -J2EE_HOME=n:\j2sdkee1.2 -.ENDIF - -NODEFAULTUNO=TRUE -NOJARDEP=TRUE - -javauno=TRUE - -JARFILES = - -JAVA_EXTENSIONS = - diff --git a/scripting/util/target.pmk b/scripting/util/target.pmk deleted file mode 100755 index d6b1006fda..0000000000 --- a/scripting/util/target.pmk +++ /dev/null @@ -1,28 +0,0 @@ -#************************************************************************* -# -# 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. -# -#************************************************************************* - -.INCLUDE : target.mk diff --git a/sfx2/AllLangResTarget_sfx2.mk b/sfx2/AllLangResTarget_sfx2.mk index 77691fe880..665d53f6fe 100755 --- a/sfx2/AllLangResTarget_sfx2.mk +++ b/sfx2/AllLangResTarget_sfx2.mk @@ -75,6 +75,7 @@ $(eval $(call gb_SrsTarget_add_files,sfx/res,\ sfx2/source/doc/docvor.src \ sfx2/source/doc/graphhelp.src \ sfx2/source/doc/new.src \ + sfx2/source/doc/templatelocnames.src \ sfx2/source/menu/menu.src \ sfx2/source/view/view.src \ )) diff --git a/sfx2/Package_inc.mk b/sfx2/Package_inc.mk index 6ecf5f368d..c68cb9613d 100755 --- a/sfx2/Package_inc.mk +++ b/sfx2/Package_inc.mk @@ -128,6 +128,7 @@ $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/tabdlg.hxx,sfx2/tabdlg.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/taskpane.hxx,sfx2/taskpane.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/tbxctrl.hxx,sfx2/tbxctrl.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/templdlg.hxx,sfx2/templdlg.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/templatelocnames.hrc,sfx2/templatelocnames.hrc)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/titledockwin.hxx,sfx2/titledockwin.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/tplpitem.hxx,sfx2/tplpitem.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/unoctitm.hxx,sfx2/unoctitm.hxx)) diff --git a/sfx2/inc/sfx2/docfile.hxx b/sfx2/inc/sfx2/docfile.hxx index 6b9dcdff7e..6c427e9d60 100644 --- a/sfx2/inc/sfx2/docfile.hxx +++ b/sfx2/inc/sfx2/docfile.hxx @@ -246,7 +246,6 @@ public: SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetInputStream_Impl(); SAL_DLLPRIVATE void CloseAndReleaseStreams_Impl(); - SAL_DLLPRIVATE void RefreshName_Impl(); SAL_DLLPRIVATE sal_uInt16 AddVersion_Impl( com::sun::star::util::RevisionTag& rVersion ); SAL_DLLPRIVATE sal_Bool TransferVersionList_Impl( SfxMedium& rMedium ); SAL_DLLPRIVATE sal_Bool SaveVersionList_Impl( sal_Bool bUseXML ); @@ -254,8 +253,6 @@ public: SAL_DLLPRIVATE void SetExpired_Impl( const DateTime& rDateTime ); SAL_DLLPRIVATE SvKeyValueIterator* GetHeaderAttributes_Impl(); - SAL_DLLPRIVATE const String& GetPreRedirectedURL() const; - SAL_DLLPRIVATE void SetOrigFilter_Impl( const SfxFilter* pFilter ); // Diese Protokolle liefern MIME Typen SAL_DLLPRIVATE sal_Bool SupportsMIME_Impl() const; @@ -275,12 +272,9 @@ public: { aLongName = rName; } SAL_DLLPRIVATE const String & GetLongName() const { return aLongName; } SAL_DLLPRIVATE ErrCode CheckOpenMode_Impl( sal_Bool bSilent, sal_Bool bAllowRO = sal_True ); - SAL_DLLPRIVATE sal_Bool IsDownloadDone_Impl(); SAL_DLLPRIVATE sal_Bool IsPreview_Impl(); SAL_DLLPRIVATE void ClearBackup_Impl(); SAL_DLLPRIVATE void Done_Impl( ErrCode ); - SAL_DLLPRIVATE void DataAvailable_Impl(); - SAL_DLLPRIVATE void Cancel_Impl(); SAL_DLLPRIVATE void SetPhysicalName_Impl(const String& rName); SAL_DLLPRIVATE void CanDisposeStorage_Impl( sal_Bool bDisposeStorage ); SAL_DLLPRIVATE sal_Bool WillDisposeStorageOnClose_Impl(); diff --git a/sfx2/inc/sfx2/frmhtml.hxx b/sfx2/inc/sfx2/frmhtml.hxx index 10e744d09d..c95e1d8ac0 100644 --- a/sfx2/inc/sfx2/frmhtml.hxx +++ b/sfx2/inc/sfx2/frmhtml.hxx @@ -52,7 +52,7 @@ protected: public: // These methods can also be used by other parsers. - static void ParseFrameOptions(SfxFrameDescriptor*, const HTMLOptions*, const String& ); + static void ParseFrameOptions(SfxFrameDescriptor*, const HTMLOptions&, const String& ); }; diff --git a/sfx2/inc/sfx2/progress.hxx b/sfx2/inc/sfx2/progress.hxx index d8a580a7ba..c785aca883 100644 --- a/sfx2/inc/sfx2/progress.hxx +++ b/sfx2/inc/sfx2/progress.hxx @@ -82,8 +82,6 @@ public: DECL_DLLPRIVATE_STATIC_LINK( SfxProgress, SetStateHdl, PlugInLoadStatus* ); DECL_DLLPRIVATE_STATIC_LINK( SfxProgress, DefaultBindingProgress, SvProgressArg* ); - SAL_DLLPRIVATE bool StatusBarManagerGone_Impl(SfxStatusBarManager*pStb); - SAL_DLLPRIVATE const String& GetStateText_Impl() const; }; #endif diff --git a/sfx2/inc/sfx2/sfxhtml.hxx b/sfx2/inc/sfx2/sfxhtml.hxx index d5335dd177..3c00f53424 100644 --- a/sfx2/inc/sfx2/sfxhtml.hxx +++ b/sfx2/inc/sfx2/sfxhtml.hxx @@ -65,12 +65,11 @@ public: // Read the options of an image map // <MAP>: sal_True = Image-Map has a name // <AREA>: sal_True = Image-Map has now one Region more - static sal_Bool ParseMapOptions(ImageMap * pImageMap, - const HTMLOptions * pOptions ); - sal_Bool ParseMapOptions(ImageMap * pImageMap) + static bool ParseMapOptions(ImageMap* pImageMap, const HTMLOptions& rOptions); + bool ParseMapOptions(ImageMap * pImageMap) { return ParseMapOptions(pImageMap, GetOptions()); } - static sal_Bool ParseAreaOptions(ImageMap * pImageMap, const String& rBaseURL, - const HTMLOptions * pOptions, + static bool ParseAreaOptions(ImageMap * pImageMap, const String& rBaseURL, + const HTMLOptions& rOptions, sal_uInt16 nEventMouseOver = 0, sal_uInt16 nEventMouseOut = 0 ); inline sal_Bool ParseAreaOptions(ImageMap * pImageMap, const String& rBaseURL, diff --git a/sfx2/inc/sfx2/templatelocnames.hrc b/sfx2/inc/sfx2/templatelocnames.hrc new file mode 100644 index 0000000000..f8034ed181 --- /dev/null +++ b/sfx2/inc/sfx2/templatelocnames.hrc @@ -0,0 +1,81 @@ +/* + * Version: MPL 1.1 / GPLv3+ / LGPLv3+ + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Initial Developer of the Original Code is + * Péter Rabi <prabi@caesar.elte.hu> + * Portions created by the Initial Developer are Copyright (C) 2011 the + * Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 3 or later (the "GPLv3+"), or + * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), + * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable + * instead of those above. + */ + +#define NUM_TEMPLATE_NAMES 25 +#define TEMPL_LOC_OFFSET 2190 + +#define STR_TEMPLATE_NAME1_DEF (TEMPL_LOC_OFFSET + 1) +#define STR_TEMPLATE_NAME2_DEF (TEMPL_LOC_OFFSET + 2) +#define STR_TEMPLATE_NAME3_DEF (TEMPL_LOC_OFFSET + 3) +#define STR_TEMPLATE_NAME4_DEF (TEMPL_LOC_OFFSET + 4) +#define STR_TEMPLATE_NAME5_DEF (TEMPL_LOC_OFFSET + 5) +#define STR_TEMPLATE_NAME6_DEF (TEMPL_LOC_OFFSET + 6) +#define STR_TEMPLATE_NAME7_DEF (TEMPL_LOC_OFFSET + 7) +#define STR_TEMPLATE_NAME8_DEF (TEMPL_LOC_OFFSET + 8) +#define STR_TEMPLATE_NAME9_DEF (TEMPL_LOC_OFFSET + 9) +#define STR_TEMPLATE_NAME10_DEF (TEMPL_LOC_OFFSET + 10) +#define STR_TEMPLATE_NAME11_DEF (TEMPL_LOC_OFFSET + 11) +#define STR_TEMPLATE_NAME12_DEF (TEMPL_LOC_OFFSET + 12) +#define STR_TEMPLATE_NAME13_DEF (TEMPL_LOC_OFFSET + 13) +#define STR_TEMPLATE_NAME14_DEF (TEMPL_LOC_OFFSET + 14) +#define STR_TEMPLATE_NAME15_DEF (TEMPL_LOC_OFFSET + 15) +#define STR_TEMPLATE_NAME16_DEF (TEMPL_LOC_OFFSET + 16) +#define STR_TEMPLATE_NAME17_DEF (TEMPL_LOC_OFFSET + 17) +#define STR_TEMPLATE_NAME18_DEF (TEMPL_LOC_OFFSET + 18) +#define STR_TEMPLATE_NAME19_DEF (TEMPL_LOC_OFFSET + 19) +#define STR_TEMPLATE_NAME20_DEF (TEMPL_LOC_OFFSET + 20) +#define STR_TEMPLATE_NAME21_DEF (TEMPL_LOC_OFFSET + 21) +#define STR_TEMPLATE_NAME22_DEF (TEMPL_LOC_OFFSET + 22) +#define STR_TEMPLATE_NAME23_DEF (TEMPL_LOC_OFFSET + 23) +#define STR_TEMPLATE_NAME24_DEF (TEMPL_LOC_OFFSET + 24) +#define STR_TEMPLATE_NAME25_DEF (TEMPL_LOC_OFFSET + 25) + +#define STR_TEMPLATE_NAME1 (TEMPL_LOC_OFFSET + 51) +#define STR_TEMPLATE_NAME2 (TEMPL_LOC_OFFSET + 52) +#define STR_TEMPLATE_NAME3 (TEMPL_LOC_OFFSET + 53) +#define STR_TEMPLATE_NAME4 (TEMPL_LOC_OFFSET + 54) +#define STR_TEMPLATE_NAME5 (TEMPL_LOC_OFFSET + 55) +#define STR_TEMPLATE_NAME6 (TEMPL_LOC_OFFSET + 56) +#define STR_TEMPLATE_NAME7 (TEMPL_LOC_OFFSET + 57) +#define STR_TEMPLATE_NAME8 (TEMPL_LOC_OFFSET + 58) +#define STR_TEMPLATE_NAME9 (TEMPL_LOC_OFFSET + 59) +#define STR_TEMPLATE_NAME10 (TEMPL_LOC_OFFSET + 60) +#define STR_TEMPLATE_NAME11 (TEMPL_LOC_OFFSET + 61) +#define STR_TEMPLATE_NAME12 (TEMPL_LOC_OFFSET + 62) +#define STR_TEMPLATE_NAME13 (TEMPL_LOC_OFFSET + 63) +#define STR_TEMPLATE_NAME14 (TEMPL_LOC_OFFSET + 64) +#define STR_TEMPLATE_NAME15 (TEMPL_LOC_OFFSET + 65) +#define STR_TEMPLATE_NAME16 (TEMPL_LOC_OFFSET + 66) +#define STR_TEMPLATE_NAME17 (TEMPL_LOC_OFFSET + 67) +#define STR_TEMPLATE_NAME18 (TEMPL_LOC_OFFSET + 68) +#define STR_TEMPLATE_NAME19 (TEMPL_LOC_OFFSET + 69) +#define STR_TEMPLATE_NAME20 (TEMPL_LOC_OFFSET + 70) +#define STR_TEMPLATE_NAME21 (TEMPL_LOC_OFFSET + 71) +#define STR_TEMPLATE_NAME22 (TEMPL_LOC_OFFSET + 72) +#define STR_TEMPLATE_NAME23 (TEMPL_LOC_OFFSET + 73) +#define STR_TEMPLATE_NAME24 (TEMPL_LOC_OFFSET + 74) +#define STR_TEMPLATE_NAME25 (TEMPL_LOC_OFFSET + 75) diff --git a/sfx2/source/bastyp/frmhtml.cxx b/sfx2/source/bastyp/frmhtml.cxx index 5a8f720229..60f2867639 100644 --- a/sfx2/source/bastyp/frmhtml.cxx +++ b/sfx2/source/bastyp/frmhtml.cxx @@ -65,7 +65,8 @@ static HTMLOptionEnum const aScollingTable[] = { 0, 0 } }; -void SfxFrameHTMLParser::ParseFrameOptions( SfxFrameDescriptor *pFrame, const HTMLOptions *pOptions, const String& rBaseURL ) +void SfxFrameHTMLParser::ParseFrameOptions( + SfxFrameDescriptor *pFrame, const HTMLOptions& rOptions, const String& rBaseURL ) { // Get and set the options Size aMargin( pFrame->GetMargin() ); @@ -77,16 +78,15 @@ void SfxFrameHTMLParser::ParseFrameOptions( SfxFrameDescriptor *pFrame, const HT // We will not mimic that bug ! sal_Bool bMarginWidth = sal_False, bMarginHeight = sal_False; - sal_uInt16 nArrLen = pOptions->Count(); - for ( sal_uInt16 i=0; i<nArrLen; i++ ) + for (size_t i = 0, n = rOptions.size(); i < n; ++i) { - const HTMLOption *pOption = (*pOptions)[i]; - switch( pOption->GetToken() ) + const HTMLOption& aOption = rOptions[i]; + switch( aOption.GetToken() ) { case HTML_O_BORDERCOLOR: { Color aColor; - pOption->GetColor( aColor ); + aOption.GetColor( aColor ); pFrame->SetWallpaper( Wallpaper( aColor ) ); break; } @@ -94,20 +94,20 @@ void SfxFrameHTMLParser::ParseFrameOptions( SfxFrameDescriptor *pFrame, const HT pFrame->SetURL( String( INetURLObject::GetAbsURL( - rBaseURL, pOption->GetString())) ); + rBaseURL, aOption.GetString())) ); break; case HTML_O_NAME: - pFrame->SetName( pOption->GetString() ); + pFrame->SetName( aOption.GetString() ); break; case HTML_O_MARGINWIDTH: - aMargin.Width() = pOption->GetNumber(); + aMargin.Width() = aOption.GetNumber(); if( !bMarginHeight ) aMargin.Height() = 0; bMarginWidth = sal_True; break; case HTML_O_MARGINHEIGHT: - aMargin.Height() = pOption->GetNumber(); + aMargin.Height() = aOption.GetNumber(); if( !bMarginWidth ) aMargin.Width() = 0; @@ -115,12 +115,12 @@ void SfxFrameHTMLParser::ParseFrameOptions( SfxFrameDescriptor *pFrame, const HT break; case HTML_O_SCROLLING: pFrame->SetScrollingMode( - (ScrollingMode)pOption->GetEnum( aScollingTable, + (ScrollingMode)aOption.GetEnum( aScollingTable, ScrollingAuto ) ); break; case HTML_O_FRAMEBORDER: { - String aStr = pOption->GetString(); + String aStr = aOption.GetString(); sal_Bool bBorder = sal_True; if ( aStr.EqualsIgnoreCaseAscii("NO") || aStr.EqualsIgnoreCaseAscii("0") ) @@ -132,19 +132,19 @@ void SfxFrameHTMLParser::ParseFrameOptions( SfxFrameDescriptor *pFrame, const HT pFrame->SetResizable( sal_False ); break; default: - if ( pOption->GetTokenString().EqualsIgnoreCaseAscii( + if ( aOption.GetTokenString().EqualsIgnoreCaseAscii( HTML_O_READONLY ) ) { - String aStr = pOption->GetString(); + String aStr = aOption.GetString(); sal_Bool bReadonly = sal_True; if ( aStr.EqualsIgnoreCaseAscii("FALSE") ) bReadonly = sal_False; pFrame->SetReadOnly( bReadonly ); } - else if ( pOption->GetTokenString().EqualsIgnoreCaseAscii( + else if ( aOption.GetTokenString().EqualsIgnoreCaseAscii( HTML_O_EDIT ) ) { - String aStr = pOption->GetString(); + String aStr = aOption.GetString(); sal_Bool bEdit = sal_True; if ( aStr.EqualsIgnoreCaseAscii("FALSE") ) bEdit = sal_False; diff --git a/sfx2/source/bastyp/helper.cxx b/sfx2/source/bastyp/helper.cxx index 15d40a0d56..e00fbda6c3 100644 --- a/sfx2/source/bastyp/helper.cxx +++ b/sfx2/source/bastyp/helper.cxx @@ -121,33 +121,6 @@ sal_Bool SfxContentHelper::IsDocument( const String& rContent ) // ----------------------------------------------------------------------- -sal_Bool SfxContentHelper::Kill( const String& rContent ) -{ - sal_Bool bRet = sal_True; - INetURLObject aDeleteObj( rContent ); - DBG_ASSERT( aDeleteObj.GetProtocol() != INET_PROT_NOT_VALID, "Invalid URL!" ); - - try - { - ::ucbhelper::Content aCnt( aDeleteObj.GetMainURL( INetURLObject::NO_DECODE ), uno::Reference< ucb::XCommandEnvironment > () ); - aCnt.executeCommand( OUString(RTL_CONSTASCII_USTRINGPARAM("delete")), uno::makeAny( sal_Bool( sal_True ) ) ); - } - catch( const ucb::CommandAbortedException& ) - { - DBG_WARNING( "CommandAbortedException" ); - bRet = sal_False; - } - catch( const uno::Exception& ) - { - DBG_ERRORFILE( "Any other exception" ); - bRet = sal_False; - } - - return bRet; -} - -// ----------------------------------------------------------------------- - uno::Sequence < OUString > SfxContentHelper::GetResultSet( const String& rURL ) { StringList_Impl* pList = NULL; diff --git a/sfx2/source/bastyp/progress.cxx b/sfx2/source/bastyp/progress.cxx index 625440d297..1482b0458d 100644 --- a/sfx2/source/bastyp/progress.cxx +++ b/sfx2/source/bastyp/progress.cxx @@ -258,13 +258,6 @@ void SfxProgress::SetText // ----------------------------------------------------------------------- -const String& SfxProgress::GetStateText_Impl() const -{ - return pImp->aStateText; -} - -// ----------------------------------------------------------------------- - // Required in App data static sal_uIntPtr nLastTime = 0; @@ -669,21 +662,4 @@ void SfxProgress::LeaveLock() pImp->nRescheduleLocks--; } -// ----------------------------------------------------------------------- - -bool SfxProgress::StatusBarManagerGone_Impl -( - SfxStatusBarManager * // This <SfxStatusBarManager> will be destroyed -) - -/* [Description] - - Internal method for notifying the SfxProgress that the specified - SfxStatusBarManger will be destroyed so that the Progress can let go of it. -*/ - -{ - return sal_True; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/bastyp/sfxhtml.cxx b/sfx2/source/bastyp/sfxhtml.cxx index f41c4f525b..a7e469dd01 100644 --- a/sfx2/source/bastyp/sfxhtml.cxx +++ b/sfx2/source/bastyp/sfxhtml.cxx @@ -96,21 +96,20 @@ SfxHTMLParser::~SfxHTMLParser() delete pDLMedium; } -sal_Bool SfxHTMLParser::ParseMapOptions(ImageMap * pImageMap, - const HTMLOptions * pOptions) +bool SfxHTMLParser::ParseMapOptions( + ImageMap* pImageMap, const HTMLOptions& rOptions) { DBG_ASSERT( pImageMap, "ParseMapOptions: No Image-Map" ); - DBG_ASSERT( pOptions, "ParseMapOptions: No Options" ); String aName; - for( sal_uInt16 i=pOptions->Count(); i; ) + for (size_t i = rOptions.size(); i; ) { - const HTMLOption *pOption = (*pOptions)[--i]; - switch( pOption->GetToken() ) + const HTMLOption& aOption = rOptions[--i]; + switch( aOption.GetToken() ) { case HTML_O_NAME: - aName = pOption->GetString(); + aName = aOption.GetString(); break; } } @@ -121,13 +120,12 @@ sal_Bool SfxHTMLParser::ParseMapOptions(ImageMap * pImageMap, return aName.Len() > 0; } -sal_Bool SfxHTMLParser::ParseAreaOptions(ImageMap * pImageMap, const String& rBaseURL, - const HTMLOptions * pOptions, +bool SfxHTMLParser::ParseAreaOptions(ImageMap * pImageMap, const String& rBaseURL, + const HTMLOptions& rOptions, sal_uInt16 nEventMouseOver, sal_uInt16 nEventMouseOut ) { DBG_ASSERT( pImageMap, "ParseAreaOptions: no Image-Map" ); - DBG_ASSERT( pOptions, "ParseAreaOptions: no Options" ); sal_uInt16 nShape = IMAP_OBJ_RECTANGLE; SvULongs aCoords; @@ -135,33 +133,33 @@ sal_Bool SfxHTMLParser::ParseAreaOptions(ImageMap * pImageMap, const String& rBa sal_Bool bNoHRef = sal_False; SvxMacroTableDtor aMacroTbl; - for( sal_uInt16 i=pOptions->Count(); i; ) + for (size_t i = rOptions.size(); i; ) { sal_uInt16 nEvent = 0; ScriptType eScrpType = STARBASIC; - const HTMLOption *pOption = (*pOptions)[--i]; - switch( pOption->GetToken() ) + const HTMLOption& rOption = rOptions[--i]; + switch( rOption.GetToken() ) { case HTML_O_NAME: - aName = pOption->GetString(); + aName = rOption.GetString(); break; case HTML_O_SHAPE: - pOption->GetEnum( nShape, aAreaShapeOptEnums ); + rOption.GetEnum( nShape, aAreaShapeOptEnums ); break; case HTML_O_COORDS: - pOption->GetNumbers( aCoords, sal_True ); + rOption.GetNumbers( aCoords, sal_True ); break; case HTML_O_HREF: - aHRef = INetURLObject::GetAbsURL( rBaseURL, pOption->GetString() ); + aHRef = INetURLObject::GetAbsURL( rBaseURL, rOption.GetString() ); break; case HTML_O_NOHREF: bNoHRef = sal_True; break; case HTML_O_ALT: - aAlt = pOption->GetString(); + aAlt = rOption.GetString(); break; case HTML_O_TARGET: - aTarget = pOption->GetString(); + aTarget = rOption.GetString(); break; case HTML_O_ONMOUSEOVER: @@ -178,7 +176,7 @@ sal_Bool SfxHTMLParser::ParseAreaOptions(ImageMap * pImageMap, const String& rBa IMAPOBJ_SETEVENT: if( nEvent ) { - String sTmp( pOption->GetString() ); + String sTmp( rOption.GetString() ); if( sTmp.Len() ) { sTmp.ConvertLineEnd(); diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index 5386853be5..bd1f9b1314 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -323,17 +323,6 @@ public: ~SfxMedium_Impl(); }; -void SfxMedium::DataAvailable_Impl() -{ - pImp->aAvailableLink.ClearPendingCall(); - pImp->aAvailableLink.Call( NULL ); -} - -void SfxMedium::Cancel_Impl() -{ - SetError( ERRCODE_IO_GENERAL, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); -} - //------------------------------------------------------------------ SfxMedium_Impl::SfxMedium_Impl( SfxMedium* pAntiImplP ) : SvCompatWeakBase( pAntiImplP ), @@ -2587,13 +2576,6 @@ const SfxFilter* SfxMedium::GetOrigFilter( sal_Bool bNotCurrent ) const //---------------------------------------------------------------- -void SfxMedium::SetOrigFilter_Impl( const SfxFilter* pOrigFilter ) -{ - pImp->pOrigFilter = pOrigFilter; -} - -//------------------------------------------------------------------ - sal_uInt32 SfxMedium::CreatePasswordToModifyHash( const ::rtl::OUString& aPasswd, sal_Bool bWriter ) { sal_uInt32 nHash = 0; @@ -2753,10 +2735,6 @@ void SfxMedium::CloseStreams_Impl() //------------------------------------------------------------------ -void SfxMedium::RefreshName_Impl() -{ -} - void SfxMedium::SetIsRemote_Impl() { INetURLObject aObj( GetName() ); @@ -3040,13 +3018,6 @@ const INetURLObject& SfxMedium::GetURLObject() const //---------------------------------------------------------------- -const String& SfxMedium::GetPreRedirectedURL() const -{ - return pImp->aPreRedirectionURL; -} - -//---------------------------------------------------------------- - void SfxMedium::SetReferer( const String& rRefer ) { pImp->aReferer = rRefer; @@ -3144,11 +3115,6 @@ SvCompatWeakHdl* SfxMedium::GetHdl() return pImp->GetHdl(); } -sal_Bool SfxMedium::IsDownloadDone_Impl() -{ - return pImp->bDownloadDone; -} - ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SfxMedium::GetInputStream() { if ( !pImp->xInputStream.is() ) diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx index d28d0e6c5c..dc72cb573e 100644 --- a/sfx2/source/doc/doctempl.cxx +++ b/sfx2/source/doc/doctempl.cxx @@ -94,6 +94,7 @@ using namespace ::ucbhelper; #include "sfxtypes.hxx" #include <sfx2/app.hxx> #include "sfx2/sfxresid.hxx" +#include <sfx2/templatelocnames.hrc> #include "doc.hrc" #include <sfx2/fcontnr.hxx> #include <svtools/templatefoldercache.hxx> @@ -151,6 +152,8 @@ class DocTempl_EntryData_Impl private: RegionData_Impl* GetParent() const { return mpParent; } + OUString ConvertResourceString( + int nSourceResIds, int nDestResIds, int nCount, const OUString& rString ); public: DocTempl_EntryData_Impl( RegionData_Impl* pParent, @@ -1761,12 +1764,27 @@ DocTempl_EntryData_Impl::DocTempl_EntryData_Impl( RegionData_Impl* pParent, const OUString& rTitle ) { mpParent = pParent; - maTitle = rTitle; + maTitle = ConvertResourceString( + STR_TEMPLATE_NAME1_DEF, STR_TEMPLATE_NAME1, NUM_TEMPLATE_NAMES, rTitle ); mbIsOwner = sal_False; mbDidConvert= sal_False; } // ----------------------------------------------------------------------- +OUString DocTempl_EntryData_Impl::ConvertResourceString ( + int nSourceResIds, int nDestResIds, int nCount, const OUString& rString ) +{ + for( int i = 0; i < nCount; ++i ) + { + if( rString == ResId::toString( (const ResId)SfxResId( (sal_uInt16)(nSourceResIds + i) ) ) ) + { + return ResId::toString( (const ResId)SfxResId( (sal_uInt16)(nDestResIds + i) ) ); + } + } + return rString; +} + +// ----------------------------------------------------------------------- int DocTempl_EntryData_Impl::Compare( const OUString& rTitle ) const { return maTitle.compareTo( rTitle ); diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx index 0695d9df43..f487e6699a 100644 --- a/sfx2/source/doc/new.cxx +++ b/sfx2/source/doc/new.cxx @@ -104,19 +104,6 @@ void SfxPreviewBase_Impl::Resize() Invalidate(); } -void SfxPreviewBase_Impl::SetGDIFile( ::boost::shared_ptr<GDIMetaFile> pFile ) -{ - pMetaFile = pFile; - Invalidate(); -} - -SfxFrameWindow* SfxPreviewWin_Impl::PreviewFactory( - SfxFrame* pFrame, const String& /*rName*/ ) -{ - return new SfxFrameWindow( new SfxPreviewWin_Impl( - &pFrame->GetCurrentViewFrame()->GetWindow() ) ); -} - void SfxPreviewWin_Impl::ImpPaint( const Rectangle&, GDIMetaFile* pFile, Window* pWindow ) { diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index 98ded9fdf3..eb5798acd4 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -2079,33 +2079,6 @@ sal_Bool SfxObjectShell::UseInteractionToHandleError( return bResult; } -sal_Bool SfxObjectShell_Impl::NeedsOfficeUpdateDialog() -{ - // if the configuration is not available for any reason, the default behavior is to show the message - sal_Bool bResult = sal_True; - - try - { - uno::Reference< lang::XMultiServiceFactory > xServiceManager( ::comphelper::getProcessServiceFactory(), uno::UNO_SET_THROW ); - uno::Reference< uno::XInterface > xCommonConfig( - ::comphelper::ConfigurationHelper::openConfig( - xServiceManager, - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.Common" ) ), - ::comphelper::ConfigurationHelper::E_STANDARD ), - uno::UNO_SET_THROW ); - - ::comphelper::ConfigurationHelper::readRelativeKey( - xCommonConfig, - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Load/" ) ), - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ShowOfficeUpdateDialog" ) ) ) >>= bResult; - } - catch( uno::Exception& ) - { - } - - return bResult; -} - sal_Int16 SfxObjectShell_Impl::getCurrentMacroExecMode() const { sal_Int16 nImposedExecMode( MacroExecMode::NEVER_EXECUTE ); diff --git a/sfx2/source/doc/templatelocnames.src b/sfx2/source/doc/templatelocnames.src new file mode 100644 index 0000000000..9b977554a4 --- /dev/null +++ b/sfx2/source/doc/templatelocnames.src @@ -0,0 +1,281 @@ +/* + * Version: MPL 1.1 / GPLv3+ / LGPLv3+ + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Initial Developer of the Original Code is + * Péter Rabi <prabi@caesar.elte.hu> + * Portions created by the Initial Developer are Copyright (C) 2011 the + * Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 3 or later (the "GPLv3+"), or + * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), + * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable + * instead of those above. + */ + +#include <sfx2/templatelocnames.hrc> + +// Do not translate STR_TEMPLATE_NAME*_DEF names!! +String STR_TEMPLATE_NAME1_DEF +{ + Text = "Blue Border" ; +}; + +String STR_TEMPLATE_NAME2_DEF +{ + Text = "Black and White" ; +}; + +String STR_TEMPLATE_NAME3_DEF +{ + Text = "Blue and Grey" ; +}; + +String STR_TEMPLATE_NAME4_DEF +{ + Text = "Blue Lines and Gradients" ; +}; + +String STR_TEMPLATE_NAME5_DEF +{ + Text = "Blue with Bottom Title" ; +}; + +String STR_TEMPLATE_NAME6_DEF +{ + Text = "Notebook" ; +}; + +String STR_TEMPLATE_NAME7_DEF +{ + Text = "Brown" ; +}; + +String STR_TEMPLATE_NAME8_DEF +{ + Text = "Characters with Glow" ; +}; + +String STR_TEMPLATE_NAME9_DEF +{ + Text = "Forest" ; +}; + +String STR_TEMPLATE_NAME10_DEF +{ + Text = "Fresco" ; +}; + +String STR_TEMPLATE_NAME11_DEF +{ + Text = "Glacier" ; +}; + +String STR_TEMPLATE_NAME12_DEF +{ + Text = "Green with White Lines" ; +}; + +String STR_TEMPLATE_NAME13_DEF +{ + Text = "Keyboard" ; +}; + +String STR_TEMPLATE_NAME14_DEF +{ + Text = "Light Blue Shapes" ; +}; + +String STR_TEMPLATE_NAME15_DEF +{ + Text = "Numbers on Dark Background" ; +}; + +String STR_TEMPLATE_NAME16_DEF +{ + Text = "Blue Step Gradients" ; +}; + +String STR_TEMPLATE_NAME17_DEF +{ + Text = "White Blue and Lightnings" ; +}; + +String STR_TEMPLATE_NAME18_DEF +{ + Text = "Noise Paper" ; +}; + +String STR_TEMPLATE_NAME19_DEF +{ + Text = "Red Noise Shapes" ; +}; + +String STR_TEMPLATE_NAME20_DEF +{ + Text = "Rounded Rectangles" ; +}; + +String STR_TEMPLATE_NAME21_DEF +{ + Text = "Blue and Red Gradient" ; +}; + +String STR_TEMPLATE_NAME22_DEF +{ + Text = "Technical Polygon" ; +}; + +String STR_TEMPLATE_NAME23_DEF +{ + Text = "Tunnel" ; +}; + +String STR_TEMPLATE_NAME24_DEF +{ + Text = "Water" ; +}; + +String STR_TEMPLATE_NAME25_DEF +{ + Text = "Wine" ; +}; + +///////////////////////////////////////////////// + +String STR_TEMPLATE_NAME1 +{ + Text [ en-US ] = "Blue Border" ; +}; + +String STR_TEMPLATE_NAME2 +{ + Text [ en-US ] = "Black and White" ; +}; + +String STR_TEMPLATE_NAME3 +{ + Text [ en-US ] = "Blue and Grey" ; +}; + +String STR_TEMPLATE_NAME4 +{ + Text [ en-US ] = "Blue Lines and Gradients" ; +}; + +String STR_TEMPLATE_NAME5 +{ + Text [ en-US ] = "Blue with Bottom Title" ; +}; + +String STR_TEMPLATE_NAME6 +{ + Text [ en-US ] = "Notebook" ; +}; + +String STR_TEMPLATE_NAME7 +{ + Text [ en-US ] = "Brown" ; +}; + +String STR_TEMPLATE_NAME8 +{ + Text [ en-US ] = "Characters with Glow" ; +}; + +String STR_TEMPLATE_NAME9 +{ + Text [ en-US ] = "Forest" ; +}; + +String STR_TEMPLATE_NAME10 +{ + Text [ en-US ] = "Fresco" ; +}; + +String STR_TEMPLATE_NAME11 +{ + Text [ en-US ] = "Glacier" ; +}; + +String STR_TEMPLATE_NAME12 +{ + Text [ en-US ] = "Green with White Lines" ; +}; + +String STR_TEMPLATE_NAME13 +{ + Text [ en-US ] = "Keyboard" ; +}; + +String STR_TEMPLATE_NAME14 +{ + Text [ en-US ] = "Light Blue Shapes" ; +}; + +String STR_TEMPLATE_NAME15 +{ + Text [ en-US ] = "Numbers on Dark Background" ; +}; + +String STR_TEMPLATE_NAME16 +{ + Text [ en-US ] = "Blue Step Gradients" ; +}; + +String STR_TEMPLATE_NAME17 +{ + Text [ en-US ] = "White Blue and Lightnings" ; +}; + +String STR_TEMPLATE_NAME18 +{ + Text [ en-US ] = "Noise Paper" ; +}; + +String STR_TEMPLATE_NAME19 +{ + Text [ en-US ] = "Red Noise Shapes" ; +}; + +String STR_TEMPLATE_NAME20 +{ + Text [ en-US ] = "Rounded Rectangles" ; +}; + +String STR_TEMPLATE_NAME21 +{ + Text [ en-US ] = "Blue and Red Gradient" ; +}; + +String STR_TEMPLATE_NAME22 +{ + Text [ en-US ] = "Technical Polygon" ; +}; + +String STR_TEMPLATE_NAME23 +{ + Text [ en-US ] = "Tunnel" ; +}; + +String STR_TEMPLATE_NAME24 +{ + Text [ en-US ] = "Water" ; +}; + +String STR_TEMPLATE_NAME25 +{ + Text [ en-US ] = "Wine" ; +}; diff --git a/sfx2/source/inc/helper.hxx b/sfx2/source/inc/helper.hxx index ebad5da12e..5ee62f43b9 100644 --- a/sfx2/source/inc/helper.hxx +++ b/sfx2/source/inc/helper.hxx @@ -43,7 +43,6 @@ class SfxContentHelper { public: static sal_Bool IsDocument( const String& rContent ); - static sal_Bool Kill( const String& rContent ); static ::com::sun::star::uno::Sequence< ::rtl::OUString > GetResultSet( const String& rURL ); diff --git a/sfx2/source/inc/objshimp.hxx b/sfx2/source/inc/objshimp.hxx index 7d2278c70a..b76bf1e9ec 100644 --- a/sfx2/source/inc/objshimp.hxx +++ b/sfx2/source/inc/objshimp.hxx @@ -157,8 +157,6 @@ struct SfxObjectShell_Impl : public ::sfx2::IMacroDocumentAccess SfxObjectShell_Impl( SfxObjectShell& _rDocShell ); virtual ~SfxObjectShell_Impl(); - static sal_Bool NeedsOfficeUpdateDialog(); - // IMacroDocumentAccess overridables virtual sal_Int16 getCurrentMacroExecMode() const; virtual sal_Bool setCurrentMacroExecMode( sal_uInt16 nMacroMode ); diff --git a/sfx2/source/inc/preview.hxx b/sfx2/source/inc/preview.hxx index e6feb4ef55..037bdd072a 100644 --- a/sfx2/source/inc/preview.hxx +++ b/sfx2/source/inc/preview.hxx @@ -48,7 +48,6 @@ public: SfxPreviewBase_Impl( Window* pParent ); ~SfxPreviewBase_Impl( ); void SetObjectShell( SfxObjectShell* pObj ); - void SetGDIFile( ::boost::shared_ptr<GDIMetaFile> pFile ); virtual void Resize(); }; @@ -66,8 +65,6 @@ public: : SfxPreviewBase_Impl( pParent ){}; static void ImpPaint( const Rectangle& rRect, GDIMetaFile* pFile, Window* pWindow ); - static SfxFrameWindow* - PreviewFactory( SfxFrame* pFrame, const String& rName ); }; #endif diff --git a/shell/source/tools/lngconvex/makefile.mk b/shell/source/tools/lngconvex/makefile.mk index 3ee6298e74..288f655376 100755 --- a/shell/source/tools/lngconvex/makefile.mk +++ b/shell/source/tools/lngconvex/makefile.mk @@ -37,6 +37,11 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk +.IF "$(BUILD_TYPE)"=="$(BUILD_TYPE:s/DESKTOP//)" +ALL: + @echo No need for this on non-desktop OSes +.ENDIF + # --- Files -------------------------------------------------------- .IF "$(COM)"=="GCC" diff --git a/shell/source/unix/exec/shellexec.cxx b/shell/source/unix/exec/shellexec.cxx index 1bbc2fd90c..a9f06f1644 100644 --- a/shell/source/unix/exec/shellexec.cxx +++ b/shell/source/unix/exec/shellexec.cxx @@ -221,12 +221,6 @@ void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aPar { aBuffer.append(aDesktopEnvironment); aBuffer.append("-"); - - /* CDE requires file urls to be decoded */ - if ( m_aDesktopEnvironment.equals("CDE") && 0 == aURL.compareToAscii("file://", 7) ) - { - aURL = rtl::Uri::decode(aURL, rtl_UriDecodeWithCharset, osl_getThreadTextEncoding()); - } } } diff --git a/xmlhelp/source/cxxhelp/provider/inputstream.cxx b/xmlhelp/source/cxxhelp/provider/inputstream.cxx index fd2ec40bc2..48ebd0e72c 100644 --- a/xmlhelp/source/cxxhelp/provider/inputstream.cxx +++ b/xmlhelp/source/cxxhelp/provider/inputstream.cxx @@ -137,7 +137,11 @@ XInputStream_impl::skipBytes( io::IOException, uno::RuntimeException) { - m_aFile.setPos( osl_Pos_Current, sal_uInt64( nBytesToSkip ) ); + if (m_aFile.setPos(osl_Pos_Current, sal_uInt64(nBytesToSkip)) != osl::FileBase::E_None) + { + throw io::IOException(::rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM("XInputStream_impl::skipBytes failed seek")), uno::Reference< uno::XInterface >()); + } } |