From 8444953804e704a4462c3416c1ad50db2ce9fec4 Mon Sep 17 00:00:00 2001 From: "Eike Rathke [er]" Date: Fri, 16 Jul 2010 20:13:45 +0200 Subject: calc56: #i108385# make TEXT return text if text was passed, handling text formats that include a @ code --- svl/inc/svl/zforlist.hxx | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'svl/inc') diff --git a/svl/inc/svl/zforlist.hxx b/svl/inc/svl/zforlist.hxx index 598295797ea6..5492759d4d36 100644 --- a/svl/inc/svl/zforlist.hxx +++ b/svl/inc/svl/zforlist.hxx @@ -520,6 +520,15 @@ public: String& sOutString, Color** ppColor, LanguageType eLnge = LANGUAGE_DONTKNOW ); + /** Format a string according to a format code string to be scanned. + @return + if format code contains an error + else, in which case the string and color are returned. + */ + BOOL GetPreviewString( const String& sFormatString, const String& sPreviewString, + String& sOutString, Color** ppColor, + LanguageType eLnge = LANGUAGE_DONTKNOW ); + /** Test whether the format code string is already present in container @return NUMBERFORMAT_ENTRY_NOT_FOUND if not found, else the format index. -- cgit From a3cfa6f635948c67ccb34ad4040230de2ec38da1 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Mon, 19 Jul 2010 22:05:23 +0200 Subject: CWS changehid: #i111784#: SetDialogHelpId changed --- svl/inc/pickerhelper.hxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'svl/inc') diff --git a/svl/inc/pickerhelper.hxx b/svl/inc/pickerhelper.hxx index 307031b578d1..0c4215a1fb83 100644 --- a/svl/inc/pickerhelper.hxx +++ b/svl/inc/pickerhelper.hxx @@ -56,11 +56,11 @@ namespace svt SVL_DLLPUBLIC void SetDialogHelpId( ::com::sun::star::uno::Reference < ::com::sun::star::ui::dialogs::XFilePicker > _mxFileDlg, - sal_Int32 _nHelpId ); + const rtl::OString& _nHelpId ); SVL_DLLPUBLIC void SetDialogHelpId( ::com::sun::star::uno::Reference < ::com::sun::star::ui::dialogs::XFolderPicker > _mxFileDlg, - sal_Int32 _nHelpId ); + const rtl::OString& _nHelpId ); } -- cgit From a929816d90303defcded933ef0337f2191fa2cec Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Tue, 20 Jul 2010 14:50:49 +0200 Subject: CWS changehid: #i111784#: consolidate usage of HID schema; remove unused SetDialogHelpId methods --- svl/inc/pickerhelper.hxx | 69 ------------------------------------------------ 1 file changed, 69 deletions(-) delete mode 100644 svl/inc/pickerhelper.hxx (limited to 'svl/inc') diff --git a/svl/inc/pickerhelper.hxx b/svl/inc/pickerhelper.hxx deleted file mode 100644 index 0c4215a1fb83..000000000000 --- a/svl/inc/pickerhelper.hxx +++ /dev/null @@ -1,69 +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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _PICKERHELPER_HXX -#define _PICKERHELPER_HXX - -#include "svl/svldllapi.h" -#include "sal/types.h" -#include "com/sun/star/uno/Reference.hxx" - -namespace com -{ - namespace sun - { - namespace star - { - namespace ui - { - namespace dialogs - { - class XFilePicker; - class XFolderPicker; - } - } - } - } -} - - -namespace svt -{ - - SVL_DLLPUBLIC void SetDialogHelpId( - ::com::sun::star::uno::Reference < ::com::sun::star::ui::dialogs::XFilePicker > _mxFileDlg, - const rtl::OString& _nHelpId ); - - SVL_DLLPUBLIC void SetDialogHelpId( - ::com::sun::star::uno::Reference < ::com::sun::star::ui::dialogs::XFolderPicker > _mxFileDlg, - const rtl::OString& _nHelpId ); - -} - -//----------------------------------------------------------------------------- - -#endif -- cgit From e937a4331fafe99449c42a07cd3ea66ffc3e488a Mon Sep 17 00:00:00 2001 From: "Thomas Lange [tl]" Date: Mon, 26 Jul 2010 13:12:35 +0200 Subject: cws tl82: #i106993# thesaurus code clean-up --- svl/inc/lngmisc.hxx | 3 +++ 1 file changed, 3 insertions(+) mode change 100644 => 100755 svl/inc/lngmisc.hxx (limited to 'svl/inc') diff --git a/svl/inc/lngmisc.hxx b/svl/inc/lngmisc.hxx old mode 100644 new mode 100755 index d85de673c4c9..5143d147227d --- a/svl/inc/lngmisc.hxx +++ b/svl/inc/lngmisc.hxx @@ -32,6 +32,7 @@ #include #include #include +#include /////////////////////////////////////////////////////////////////////////// @@ -68,6 +69,8 @@ SVL_DLLPUBLIC BOOL RemoveControlChars( rtl::OUString &rTxt ); SVL_DLLPUBLIC BOOL ReplaceControlChars( rtl::OUString &rTxt, sal_Char aRplcChar = ' ' ); +SVL_DLLPUBLIC String GetThesaurusReplaceText( const String &rText ); + } // namespace linguistic #endif -- cgit