[Libreoffice-commits] .: 5 commits - basctl/source boost/boost.6369.warnings.patch clucene/Package_source.mk cui/source oox/inc oox/source reportdesign/source sc/inc sc/source sd/source slideshow/qa slideshow/source svl/inc svl/source svtools/source sw/inc sw/source unusedcode.easy
Caolán McNamara
caolan at kemper.freedesktop.org
Wed Apr 11 04:06:54 PDT 2012
basctl/source/basicide/linenumberwindow.cxx | 4
boost/boost.6369.warnings.patch | 18 +
clucene/Package_source.mk | 182 +++++++++----------
cui/source/options/optlingu.cxx | 6
oox/inc/oox/dump/dumperbase.hxx | 2
oox/source/dump/dumperbase.cxx | 19 -
reportdesign/source/ui/dlg/GroupsSorting.cxx | 2
sc/inc/dbdata.hxx | 1
sc/source/core/tool/dbdata.cxx | 16 -
sc/source/core/tool/interpr1.cxx | 2
sc/source/filter/excel/xiescher.cxx | 6
sc/source/filter/inc/pivotcachebuffer.hxx | 2
sc/source/filter/inc/stylesbuffer.hxx | 5
sc/source/filter/oox/pivotcachebuffer.cxx | 8
sc/source/filter/oox/stylesbuffer.cxx | 35 ---
sc/source/filter/oox/workbookhelper.cxx | 8
sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx | 13 -
sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx | 8
slideshow/qa/debug/nodetree.sh | 2
slideshow/source/engine/animationnodes/nodetools.cxx | 8
slideshow/source/engine/animationnodes/nodetools.hxx | 3
svl/inc/svl/style.hxx | 2
svl/source/items/intitem.cxx | 2
svl/source/items/style.cxx | 4
svtools/source/uno/wizard/wizardshell.cxx | 2
sw/inc/docstyle.hxx | 2
sw/source/ui/app/docstyle.cxx | 6
unusedcode.easy | 53 +++++
28 files changed, 179 insertions(+), 242 deletions(-)
New commits:
commit bb7d331ecdb3a0a4723f770a9f891c00f4a25dbf
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Apr 11 10:08:16 2012 +0100
callcatcher: update list
diff --git a/oox/inc/oox/dump/dumperbase.hxx b/oox/inc/oox/dump/dumperbase.hxx
index fb1ede5..10b1e11 100644
--- a/oox/inc/oox/dump/dumperbase.hxx
+++ b/oox/inc/oox/dump/dumperbase.hxx
@@ -381,10 +381,8 @@ public:
static void appendAddress( ::rtl::OUStringBuffer& rStr, const Address& rPos );
static void appendRange( ::rtl::OUStringBuffer& rStr, const Range& rRange );
- static void appendRangeList( ::rtl::OUStringBuffer& rStr, const RangeList& rRanges );
static void appendAddress( ::rtl::OUStringBuffer& rStr, const TokenAddress& rPos, bool bR1C1 );
- static void appendRange( ::rtl::OUStringBuffer& rStr, const TokenRange& rRange, bool bR1C1 );
// encoded text output ----------------------------------------------------
diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx
index 0d8039d..62a6d4c 100644
--- a/oox/source/dump/dumperbase.cxx
+++ b/oox/source/dump/dumperbase.cxx
@@ -511,18 +511,6 @@ void StringHelper::appendRange( OUStringBuffer& rStr, const Range& rRange )
appendAddress( rStr, rRange.maLast );
}
-void StringHelper::appendRangeList( OUStringBuffer& rStr, const RangeList& rRanges )
-{
- OUStringBuffer aData;
- for( RangeList::const_iterator aIt = rRanges.begin(), aEnd = rRanges.end(); aIt != aEnd; ++aIt )
- {
- OUStringBuffer aRange;
- appendRange( aRange, *aIt );
- appendToken( aData, aRange.makeStringAndClear(), OOX_DUMP_LISTSEP );
- }
- rStr.append( aData.makeStringAndClear() );
-}
-
void StringHelper::appendAddress( OUStringBuffer& rStr, const TokenAddress& rPos, bool bR1C1 )
{
if( bR1C1 && (rPos.mbRelCol || rPos.mbRelRow) )
@@ -537,13 +525,6 @@ void StringHelper::appendAddress( OUStringBuffer& rStr, const TokenAddress& rPos
}
}
-void StringHelper::appendRange( OUStringBuffer& rStr, const TokenRange& rRange, bool bR1C1 )
-{
- appendAddress( rStr, rRange.maFirst, bR1C1 );
- rStr.append( OOX_DUMP_RANGESEP );
- appendAddress( rStr, rRange.maLast, bR1C1 );
-}
-
// encoded text output --------------------------------------------------------
void StringHelper::appendCChar( OUStringBuffer& rStr, sal_Unicode cChar, bool bPrefix )
diff --git a/sc/inc/dbdata.hxx b/sc/inc/dbdata.hxx
index cef02e1..9dcd457 100644
--- a/sc/inc/dbdata.hxx
+++ b/sc/inc/dbdata.hxx
@@ -243,7 +243,6 @@ public:
ScDBData* GetDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, sal_Bool bStartOnly);
const ScDBData* GetDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2) const;
ScDBData* GetDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2);
- const ScDBData* GetFilterDBAtTable(SCTAB nTab) const;
ScDBData* GetDBNearCursor(SCCOL nCol, SCROW nRow, SCTAB nTab );
void DeleteOnTab( SCTAB nTab );
diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx
index 4c14735..36d1914 100644
--- a/sc/source/core/tool/dbdata.cxx
+++ b/sc/source/core/tool/dbdata.cxx
@@ -974,22 +974,6 @@ ScDBData* ScDBCollection::GetDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCO
return NULL;
}
-const ScDBData* ScDBCollection::GetFilterDBAtTable(SCTAB nTab) const
-{
- NamedDBs::DBsType::const_iterator itr = find_if(
- maNamedDBs.begin(), maNamedDBs.end(), FindFilterDBByTable(nTab));
-
- const ScDBData* pData = itr == maNamedDBs.end() ? NULL : &(*itr);
- if (pData)
- return pData;
-
- pData = pDoc->GetAnonymousDBData(nTab);
- if (pData)
- return pData;
-
- return getAnonDBs().findByTable(nTab);
-}
-
void ScDBCollection::DeleteOnTab( SCTAB nTab )
{
FindByTable func(nTab);
diff --git a/sc/source/filter/inc/pivotcachebuffer.hxx b/sc/source/filter/inc/pivotcachebuffer.hxx
index 2fd32fe..cb57fef 100644
--- a/sc/source/filter/inc/pivotcachebuffer.hxx
+++ b/sc/source/filter/inc/pivotcachebuffer.hxx
@@ -459,8 +459,6 @@ private:
void importDConRef( BiffInputStream& rStrm );
/** Reads the defined name used for source data from the DCONNAME record. */
void importDConName( BiffInputStream& rStrm );
- /** Reads the built-in defined name used for source data from the DCONBINAME record. */
- void importDConBIName( BiffInputStream& rStrm );
/** Reads the sheet name and URL from the DCONREF, DCONNAME, or DCONBINAME records. */
void importDConUrl( BiffInputStream& rStrm );
diff --git a/sc/source/filter/inc/stylesbuffer.hxx b/sc/source/filter/inc/stylesbuffer.hxx
index 01ce049..185ba98 100644
--- a/sc/source/filter/inc/stylesbuffer.hxx
+++ b/sc/source/filter/inc/stylesbuffer.hxx
@@ -798,11 +798,6 @@ public:
/** Writes all formatting attributes to the passed property set. */
void writeToPropertySet( PropertySet& rPropSet ) const;
- /** Converts formatting information from BIFF2 cell record data directly. */
- static void writeBiff2CellFormatToPropertySet(
- const WorkbookHelper& rHelper, PropertySet& rPropSet,
- sal_uInt8 nFlags1, sal_uInt8 nFlags2, sal_uInt8 nFlags3 );
-
const ::ScPatternAttr& createPattern( bool bSkipPoolDefs = false );
private:
diff --git a/sc/source/filter/oox/pivotcachebuffer.cxx b/sc/source/filter/oox/pivotcachebuffer.cxx
index 94845df..2a07a61 100644
--- a/sc/source/filter/oox/pivotcachebuffer.cxx
+++ b/sc/source/filter/oox/pivotcachebuffer.cxx
@@ -1349,14 +1349,6 @@ void PivotCache::importDConName( BiffInputStream& rStrm )
importDConUrl( rStrm );
}
-void PivotCache::importDConBIName( BiffInputStream& rStrm )
-{
- sal_uInt8 nNameId = rStrm.readuInt8();
- rStrm.skip( 3 );
- maSheetSrcModel.maDefName = OUString( sal_Unicode( nNameId ) );
- importDConUrl( rStrm );
-}
-
void PivotCache::importDConUrl( BiffInputStream& rStrm )
{
// the URL with sheet name and optional URL of an external document
diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx
index 57486c2..5b11f7a 100644
--- a/sc/source/filter/oox/stylesbuffer.cxx
+++ b/sc/source/filter/oox/stylesbuffer.cxx
@@ -2627,41 +2627,6 @@ void Xf::writeToPropertySet( PropertySet& rPropSet ) const
rPropSet.setProperties( aPropMap );
}
-/*static*/ void Xf::writeBiff2CellFormatToPropertySet( const WorkbookHelper& rHelper,
- PropertySet& rPropSet, sal_uInt8 nFlags1, sal_uInt8 nFlags2, sal_uInt8 nFlags3 )
-{
- /* Create an XF object and let it do the work. We will have access to its
- private members here. Also, create temporary border and fill objects,
- this prevents polluting the border and fill buffers with new temporary
- objects per imported cell. */
- Xf aXf( rHelper );
- Border aBorder( rHelper, false );
- Fill aFill( rHelper, false );
-
- // no used flags available in BIFF2 (always true)
- aXf.setAllUsedFlags( true );
-
- // set the attributes
- aXf.maModel.mnFontId = extractValue< sal_Int32 >( nFlags2, 6, 2 );
- aXf.maModel.mnNumFmtId = extractValue< sal_Int32 >( nFlags2, 0, 6 );
- aXf.maAlignment.setBiff2Data( nFlags3 );
- aXf.maProtection.setBiff2Data( nFlags1 );
- aBorder.setBiff2Data( nFlags3 );
- aFill.setBiff2Data( nFlags3 );
-
- // finalize the objects (convert model to API attributes)
- aXf.finalizeImport();
- aBorder.finalizeImport();
- aFill.finalizeImport();
-
- // write the properties to the property set
- PropertyMap aPropMap;
- aXf.writeToPropertyMap( aPropMap );
- aBorder.writeToPropertyMap( aPropMap );
- aFill.writeToPropertyMap( aPropMap );
- rPropSet.setProperties( aPropMap );
-}
-
void Xf::setBiffUsedFlags( sal_uInt8 nUsedFlags )
{
/* Notes about finding the used flags:
diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx
index 736c5bd..627854f 100644
--- a/sc/source/filter/oox/workbookhelper.cxx
+++ b/sc/source/filter/oox/workbookhelper.cxx
@@ -233,8 +233,6 @@ public:
inline rtl_TextEncoding getTextEncoding() const { return meTextEnc; }
/** Sets the text encoding to import/export byte strings. */
void setTextEncoding( rtl_TextEncoding eTextEnc );
- /** Sets text encoding from the default application font, if CODEPAGE record is missing. */
- void setAppFontEncoding( rtl_TextEncoding eAppFontEnc );
/** Returns the codec helper that stores the encoder/decoder object. */
inline BiffCodecHelper& getCodecHelper() { return *mxCodecHelper; }
@@ -511,12 +509,6 @@ void WorkbookGlobals::setTextEncoding( rtl_TextEncoding eTextEnc )
meTextEnc = eTextEnc;
}
-void WorkbookGlobals::setAppFontEncoding( rtl_TextEncoding eAppFontEnc )
-{
- if( !mbHasCodePage )
- setTextEncoding( eAppFontEnc );
-}
-
// private --------------------------------------------------------------------
void WorkbookGlobals::initialize( bool bWorkbookFile )
diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx
index 7b84165..e40c7bd 100644
--- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx
@@ -231,19 +231,6 @@ void QueueProcessor::ProcessOneRequest (
}
}
-
-
-
-void QueueProcessor::RemoveRequest (CacheKey aKey)
-{
- (void)aKey;
- // See the method declaration above for an explanation why this makes sense.
- ::osl::MutexGuard aGuard (maMutex);
-}
-
-
-
-
void QueueProcessor::SetBitmapCache (
const ::boost::shared_ptr<BitmapCache>& rpCache)
{
diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx
index 643b8db..000094f 100644
--- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx
@@ -94,14 +94,6 @@ public:
const Size& rSize,
const bool bDoSuperSampling);
- /** As we can not really terminate the rendering of a preview bitmap for
- a request in midair this method acts more like a semaphor. It
- returns only when it is save for the caller to delete the request.
- For this to work it is important to remove the request from the
- queue before calling this method.
- */
- void RemoveRequest (CacheKey aKey);
-
/** Use this method when the page cache is (maybe) using a different
BitmapCache. This is usually necessary after calling
PageCacheManager::ChangeSize().
diff --git a/slideshow/qa/debug/nodetree.sh b/slideshow/qa/debug/nodetree.sh
index da323ec..9063181 100644
--- a/slideshow/qa/debug/nodetree.sh
+++ b/slideshow/qa/debug/nodetree.sh
@@ -25,7 +25,7 @@
# grep for the DEBUG_NODES_SHOWTREE macros in the slideshow source:
# Each such place dumps the current node tree to the trace output. Thus,
# if you need to check the tree state at other places or times, just add
-# a DEBUG_NODES_SHOWTREE (or DEBUG_NODES_SHOWTREE_WITHIN, that is).
+# a DEBUG_NODES_SHOWTREE
#
###################################################
diff --git a/slideshow/source/engine/animationnodes/nodetools.cxx b/slideshow/source/engine/animationnodes/nodetools.cxx
index b4b0bbc..4fac68c 100644
--- a/slideshow/source/engine/animationnodes/nodetools.cxx
+++ b/slideshow/source/engine/animationnodes/nodetools.cxx
@@ -58,14 +58,6 @@ namespace slideshow
++debugGetCurrentOffset();
}
-
- void debugNodesShowTreeWithin( const BaseNode* pNode )
- {
- if( pNode )
- pNode->showTreeFromWithin();
-
- ++debugGetCurrentOffset();
- }
#endif
AttributableShapeSharedPtr lookupAttributableShape( const ShapeManagerSharedPtr& rShapeManager,
diff --git a/slideshow/source/engine/animationnodes/nodetools.hxx b/slideshow/source/engine/animationnodes/nodetools.hxx
index 44109a1..4882a2a 100644
--- a/slideshow/source/engine/animationnodes/nodetools.hxx
+++ b/slideshow/source/engine/animationnodes/nodetools.hxx
@@ -41,10 +41,8 @@
#if OSL_DEBUG_LEVEL >= 2 && defined(DBG_UTIL)
# define DEBUG_NODES_SHOWTREE(a) debugNodesShowTree(a);
-# define DEBUG_NODES_SHOWTREE_WITHIN(a) debugNodesShowTreeWithin(a);
#else
# define DEBUG_NODES_SHOWTREE(a)
-# define DEBUG_NODES_SHOWTREE_WITHIN(a)
#endif
namespace slideshow
@@ -58,7 +56,6 @@ namespace slideshow
#if OSL_DEBUG_LEVEL >= 2 && defined(DBG_UTIL)
int& debugGetCurrentOffset();
void debugNodesShowTree( const BaseNode* );
- void debugNodesShowTreeWithin( const BaseNode* );
#endif
/** Look up an AttributableShape from ShapeManager.
diff --git a/unusedcode.easy b/unusedcode.easy
index 6504e38..acb0b6c 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1,3 +1,4 @@
+AboutDialog::LinkStubCancelHdl(void*, void*)
CertificateExtension_XmlSecImpl::setCertExtn(com::sun::star::uno::Sequence<signed char>, com::sun::star::uno::Sequence<signed char>, unsigned char)
CharAttribList::Clear()
Dialog::Dialog(Window*, ResId const&)
@@ -765,10 +766,57 @@ oox::core::BinaryFilterBase::BinaryFilterBase(com::sun::star::uno::Reference<com
oox::core::FilterBase::openSubStorage(rtl::OUString const&, bool) const
oox::core::FilterBase::requestEncryptionData(comphelper::IDocPasswordVerifier&) const
oox::dump::SequenceRecordObjectBase::construct(oox::dump::OutputObjectBase const&, oox::dump::BinaryInputStreamRef const&, oox::dump::String const&, oox::dump::String const&)
-oox::dump::StringHelper::appendRange(rtl::OUStringBuffer&, oox::dump::TokenRange const&, bool)
-oox::dump::StringHelper::appendRangeList(rtl::OUStringBuffer&, std::__debug::vector<oox::dump::Range, std::allocator<oox::dump::Range> > const&)
+oox::xls::Alignment::setBiff3Data(unsigned short)
+oox::xls::Alignment::setBiff4Data(unsigned short)
+oox::xls::Alignment::setBiff5Data(unsigned short)
+oox::xls::Alignment::setBiff8Data(unsigned short, unsigned short)
+oox::xls::BiffDecoder_RCF::BiffDecoder_RCF(unsigned char*, unsigned char*, unsigned char*)
+oox::xls::BiffDecoder_XOR::BiffDecoder_XOR(unsigned short, unsigned short)
+oox::xls::BiffDrawingObjectBase::importObjBiff3(oox::xls::WorksheetHelper const&, oox::xls::BiffInputStream&)
+oox::xls::BiffDrawingObjectBase::importObjBiff4(oox::xls::WorksheetHelper const&, oox::xls::BiffInputStream&)
+oox::xls::BiffDrawingObjectBase::importObjBiff5(oox::xls::WorksheetHelper const&, oox::xls::BiffInputStream&)
+oox::xls::BiffHelper::calcTextEncodingFromCodePage(unsigned short)
+oox::xls::BiffWorkbookContextBase::BiffWorkbookContextBase(oox::xls::WorkbookHelper const&)
+oox::xls::Border::setBiff3Data(unsigned int)
+oox::xls::Border::setBiff5Data(unsigned int, unsigned int)
+oox::xls::Border::setBiff8Data(unsigned int, unsigned int)
oox::xls::CellBlock::CellBlock(oox::xls::WorksheetHelper const&, oox::ValueRange const&, int)
oox::xls::CellStyleBuffer::importStyle(oox::xls::BiffInputStream&)
+oox::xls::Comment::importNoteBiff2(oox::xls::BiffInputStream&)
+oox::xls::Comment::importNoteBiff8(oox::xls::BiffInputStream&)
+oox::xls::Comment::importNoteSound(oox::xls::BiffInputStream&)
+oox::xls::CondFormat::importCfHeader(oox::xls::BiffInputStream&)
+oox::xls::DefinedNamesBuffer::importDefinedName(oox::xls::BiffInputStream&)
+oox::xls::DefinedNamesBuffer::setLocalCalcSheet(short)
+oox::xls::ExternalLink::importExternalName(oox::xls::BiffInputStream&)
+oox::xls::ExternalLinkBuffer::importExternSheet(oox::xls::BiffInputStream&)
+oox::xls::ExternalLinkBuffer::importExternSheet8(oox::xls::BiffInputStream&)
+oox::xls::ExternalLinkBuffer::importExternalBook(oox::xls::BiffInputStream&)
+oox::xls::Fill::setBiff3Data(unsigned short)
+oox::xls::Fill::setBiff5Data(unsigned int)
+oox::xls::Fill::setBiff8Data(unsigned int, unsigned short)
+oox::xls::FilterColumn::importFilterColumn(oox::xls::BiffInputStream&)
+oox::xls::Font::importFontColor(oox::xls::BiffInputStream&)
+oox::xls::Font::importFontData2(oox::xls::BiffInputStream&)
+oox::xls::Font::importFontData5(oox::xls::BiffInputStream&)
+oox::xls::Font::importFontName2(oox::xls::BiffInputStream&)
+oox::xls::Font::importFontName8(oox::xls::BiffInputStream&)
+oox::xls::PivotCache::importDConName(oox::xls::BiffInputStream&)
+oox::xls::PivotCache::importDConRef(oox::xls::BiffInputStream&)
+oox::xls::PivotTable::importPTDataField(oox::xls::BiffInputStream&)
+oox::xls::PivotTable::importPTDefinition(oox::xls::BiffInputStream&, short)
+oox::xls::PivotTable::importPTDefinition2(oox::xls::BiffInputStream&)
+oox::xls::PivotTable::importPTPageFields(oox::xls::BiffInputStream&)
+oox::xls::PivotTable::importPTRowColFields(oox::xls::BiffInputStream&)
+oox::xls::PivotTableField::importPTField(oox::xls::BiffInputStream&)
+oox::xls::Protection::setBiff3Data(unsigned short)
+oox::xls::QueryTable::importQueryTable(oox::xls::BiffInputStream&)
+oox::xls::QueryTable::importQueryTableRefresh(oox::xls::BiffInputStream&)
+oox::xls::QueryTable::importQueryTableSettings(oox::xls::BiffInputStream&)
+oox::xls::RichString::importByteString(oox::xls::BiffInputStream&, unsigned short, int)
+oox::xls::RichString::importUniString(oox::xls::BiffInputStream&, int)
+oox::xls::Scenario::importScenario(oox::xls::BiffInputStream&)
+oox::xls::Xf::setBiffUsedFlags(unsigned char)
psp::PrinterGfx::DrawBitmap(Rectangle const&, Rectangle const&, psp::PrinterBmp const&, psp::PrinterBmp const&)
psp::PrinterGfx::DrawMask(Rectangle const&, Rectangle const&, psp::PrinterBmp const&, psp::PrinterColor&)
psp::PrinterGfx::GetGlyphBoundRect(unsigned short, Rectangle&)
@@ -780,7 +828,6 @@ sd::LeftDrawPaneShell::RegisterInterface(SfxModule*)
sd::LeftImpressPaneShell::RegisterInterface(SfxModule*)
sd::ToolPanelPaneShell::RegisterInterface(SfxModule*)
sd::ViewShellBase::RegisterFactory(unsigned short)
-sd::slidesorter::cache::GenericPageCache::ReleasePreviewBitmap(SdrPage const*)
sd::slidesorter::controller::SelectionFunction::EventDescriptor::EventDescriptor(KeyEvent const&, sd::slidesorter::SlideSorter&)
sd::slidesorter::model::VisualState::SetVisualStateBlend(double)
sd::slidesorter::view::Button::IsDown() const
commit 1ed856c2653a029846f31f190ca837824c704cac
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Apr 11 00:28:56 2012 +0100
UniString->rtl::OUString
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 5c2ad38..de28f0f 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -491,7 +491,7 @@ void BrwString_Impl::Paint( const Point& rPos, SvLBox& rDev, sal_uInt16,
if(aData.HasNumericValue())
{
rtl::OUStringBuffer sTxt;
- aTxt.append(' ').append(static_cast<sal_Int32>(aData.GetNumericValue()));
+ sTxt.append(' ').append(static_cast<sal_Int32>(aData.GetNumericValue()));
rDev.SetFont( aFont );
rDev.DrawText( aNewPos, sTxt.makeStringAndClear() );
}
diff --git a/svl/inc/svl/style.hxx b/svl/inc/svl/style.hxx
index 64f28a5..f44b7d1 100644
--- a/svl/inc/svl/style.hxx
+++ b/svl/inc/svl/style.hxx
@@ -173,7 +173,7 @@ public:
virtual SfxStyleSheetBase *operator[](sal_uInt16 nIdx);
virtual SfxStyleSheetBase* First();
virtual SfxStyleSheetBase* Next();
- virtual SfxStyleSheetBase* Find(const UniString& rStr);
+ virtual SfxStyleSheetBase* Find(const rtl::OUString& rStr);
virtual ~SfxStyleSheetIterator();
protected:
diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx
index 120a09a..68c3d81 100644
--- a/svl/source/items/style.cxx
+++ b/svl/source/items/style.cxx
@@ -497,9 +497,9 @@ SfxStyleSheetBase* SfxStyleSheetIterator::Next()
}
-SfxStyleSheetBase* SfxStyleSheetIterator::Find(const XubString& rStr)
+SfxStyleSheetBase* SfxStyleSheetIterator::Find(const rtl::OUString& rStr)
{
- for ( sal_uInt16 n = 0; n < pBasePool->aStyles.size(); n++ )
+ for ( sal_uInt16 n = 0; n < pBasePool->aStyles.size(); ++n )
{
SfxStyleSheetBase* pStyle = pBasePool->aStyles[n].get();
diff --git a/sw/inc/docstyle.hxx b/sw/inc/docstyle.hxx
index 7a32215..1920985 100644
--- a/sw/inc/docstyle.hxx
+++ b/sw/inc/docstyle.hxx
@@ -177,7 +177,7 @@ public:
virtual SfxStyleSheetBase *operator[](sal_uInt16 nIdx);
virtual SfxStyleSheetBase* First();
virtual SfxStyleSheetBase* Next();
- virtual SfxStyleSheetBase* Find(const UniString& rStr);
+ virtual SfxStyleSheetBase* Find(const rtl::OUString& rStr);
virtual void Notify( SfxBroadcaster&, const SfxHint& );
};
diff --git a/sw/source/ui/app/docstyle.cxx b/sw/source/ui/app/docstyle.cxx
index 3937a43..e7aea6c 100644
--- a/sw/source/ui/app/docstyle.cxx
+++ b/sw/source/ui/app/docstyle.cxx
@@ -311,8 +311,8 @@ const SwNumRule* lcl_FindNumRule( SwDoc& rDoc,
}
-sal_uInt16 lcl_FindName( const SwPoolFmtList& rLst, SfxStyleFamily eFam,
- const String& rName )
+sal_uInt16 lcl_FindName(const SwPoolFmtList& rLst, SfxStyleFamily eFam,
+ const rtl::OUString& rName)
{
if(!rLst.empty())
{
@@ -2762,7 +2762,7 @@ SfxStyleSheetBase* SwStyleSheetIterator::Next()
return 0;
}
-SfxStyleSheetBase* SwStyleSheetIterator::Find( const UniString& rName )
+SfxStyleSheetBase* SwStyleSheetIterator::Find(const rtl::OUString& rName)
{
// searching
if( !bFirstCalled )
commit 41e055112ea778c7a45d6cc5f0ce32e44bdb031c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Apr 10 22:36:53 2012 +0100
String::CreateFromInt32->rtl::OUString::valueOf
diff --git a/basctl/source/basicide/linenumberwindow.cxx b/basctl/source/basicide/linenumberwindow.cxx
index 837e477..052e2a3 100644
--- a/basctl/source/basicide/linenumberwindow.cxx
+++ b/basctl/source/basicide/linenumberwindow.cxx
@@ -83,8 +83,8 @@ void LineNumberWindow::Paint( const Rectangle& )
}
sal_Int64 y = (nStartLine - 1) * nLineHeight;
- for(int n = nStartLine; n <= nEndLine; ++n, y += nLineHeight)
- DrawText(Point(0, y - m_nCurYOffset), String::CreateFromInt32(n));
+ for(sal_Int32 n = nStartLine; n <= nEndLine; ++n, y += nLineHeight)
+ DrawText(Point(0, y - m_nCurYOffset), rtl::OUString::valueOf(n));
}
void LineNumberWindow::DataChanged(DataChangedEvent const & rDCEvt)
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index b23de8b..5c2ad38 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -490,10 +490,10 @@ void BrwString_Impl::Paint( const Point& rPos, SvLBox& rDev, sal_uInt16,
OptionsUserData aData( (sal_uLong) pEntry->GetUserData() );
if(aData.HasNumericValue())
{
- String sTxt( ' ' );
- sTxt += String::CreateFromInt32( aData.GetNumericValue() );
+ rtl::OUStringBuffer sTxt;
+ aTxt.append(' ').append(static_cast<sal_Int32>(aData.GetNumericValue()));
rDev.SetFont( aFont );
- rDev.DrawText( aNewPos, sTxt );
+ rDev.DrawText( aNewPos, sTxt.makeStringAndClear() );
}
rDev.SetFont( aOldFont );
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx
index 5edc7a5..69f81d9 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@ -1355,7 +1355,7 @@ void OGroupsSortingDialog::displayGroup(const uno::Reference<report::XGroup>& _x
nPos = 0;
}
m_aGroupOnLst.SelectEntryPos(nPos);
- m_aGroupIntervalEd.SetText(String::CreateFromInt32(_xGroup->getGroupInterval()));
+ m_aGroupIntervalEd.SetText(rtl::OUString::valueOf(_xGroup->getGroupInterval()));
m_aGroupIntervalEd.SaveValue();
m_aGroupIntervalEd.Enable( nPos != 0 );
m_aKeepTogetherLst.SelectEntryPos(_xGroup->getKeepTogether());
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 66c19f5..3f46321 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -2102,7 +2102,7 @@ void getFormatString(SvNumberFormatter* pFormatter, sal_uLong nFormat, String& r
}
}
if( bAppendPrec )
- rFmtStr += String::CreateFromInt32( nPrec );
+ rFmtStr += rtl::OUString::valueOf(static_cast<sal_Int32>(nPrec));
const SvNumberformat* pFormat = pFormatter->GetEntry( nFormat );
if( lcl_FormatHasNegColor( pFormat ) )
rFmtStr += '-';
diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx
index 13b1667..74ed03b 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -4176,11 +4176,11 @@ void XclImpObjectManager::ConvertObjects()
OUString XclImpObjectManager::GetDefaultObjName( const XclImpDrawObjBase& rDrawObj ) const
{
- String aDefName;
+ rtl::OUStringBuffer aDefName;
DefObjNameMap::const_iterator aIt = maDefObjNames.find( rDrawObj.GetObjType() );
if( aIt != maDefObjNames.end() )
- aDefName.Append( aIt->second );
- return aDefName.Append( sal_Unicode( ' ' ) ).Append( String::CreateFromInt32( rDrawObj.GetObjId() ) );
+ aDefName.append(aIt->second);
+ return aDefName.append(' ').append(static_cast<sal_Int32>(rDrawObj.GetObjId())).makeStringAndClear();
}
ScRange XclImpObjectManager::GetUsedArea( SCTAB nScTab ) const
diff --git a/svl/source/items/intitem.cxx b/svl/source/items/intitem.cxx
index 9fea484..abe1586 100644
--- a/svl/source/items/intitem.cxx
+++ b/svl/source/items/intitem.cxx
@@ -103,7 +103,7 @@ SfxItemPresentation SfxInt16Item::GetPresentation(SfxItemPresentation,
const IntlWrapper *) const
{
DBG_CHKTHIS(SfxInt16Item, 0);
- rText = UniString::CreateFromInt32(m_nValue);
+ rText = rtl::OUString::valueOf(static_cast<sal_Int32>(m_nValue));
return SFX_ITEM_PRESENTATION_NAMELESS;
}
diff --git a/svtools/source/uno/wizard/wizardshell.cxx b/svtools/source/uno/wizard/wizardshell.cxx
index f6a2020..37b0338 100644
--- a/svtools/source/uno/wizard/wizardshell.cxx
+++ b/svtools/source/uno/wizard/wizardshell.cxx
@@ -239,7 +239,7 @@ namespace svt { namespace uno
DBG_UNHANDLED_EXCEPTION();
}
// fallback for ill-behaved clients: the numeric state
- return String::CreateFromInt32( i_nState );
+ return rtl::OUString::valueOf(static_cast<sal_Int32>(i_nState));
}
//------------------------------------------------------------------------------------------------------------------
commit cc84a792f2131d8e5b244f239f5ba71e4ef5d48d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Apr 10 22:15:50 2012 +0100
WaE: some more boost warnings
diff --git a/boost/boost.6369.warnings.patch b/boost/boost.6369.warnings.patch
index 545f9c0..2cc1ebd 100644
--- a/boost/boost.6369.warnings.patch
+++ b/boost/boost.6369.warnings.patch
@@ -303,3 +303,21 @@
std::locale l = std::locale(is.getloc(), f);
is.imbue(l);
f->get(sit, str_end, is, td);
+--- misc/boost_1_44_0/boost/spirit/home/classic/debug/impl/parser_names.ipp 2012-04-10 21:23:48.599238472 +0100
++++ misc/build/boost_1_44_0/boost/spirit/home/classic/debug/impl/parser_names.ipp 2012-04-10 21:24:02.752394878 +0100
+@@ -395,13 +395,13 @@
+ }
+
+ bool register_node(void const *r, char const *name_to_register,
+- bool trace_node)
++ bool trace_node_)
+ {
+ if (infos.find(r) != infos.end())
+ return false;
+
+ return infos.insert(rule_infos::value_type(r,
+- rule_info(std::string(name_to_register), trace_node))
++ rule_info(std::string(name_to_register), trace_node_))
+ ).second;
+ }
+
commit ba8b1c2fec58286fe1d128cc54131a858c58e369
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Apr 10 21:09:20 2012 +0100
CLucene headers are better in inc/external
diff --git a/clucene/Package_source.mk b/clucene/Package_source.mk
index f6ebe3e..486dd0d 100644
--- a/clucene/Package_source.mk
+++ b/clucene/Package_source.mk
@@ -30,96 +30,96 @@ $(eval $(call gb_Package_Package,clucene_source,$(call gb_CustomTarget_get_workd
$(call gb_Package_get_preparation_target,clucene_source) : $(call gb_CustomTarget_get_target,clucene/source)
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene.h,src/core/CLucene.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/clucene-config.h,src/shared/CLucene/clucene-config.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/SharedHeader.h,src/shared/CLucene/SharedHeader.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/document/DateField.h,src/core/CLucene/document/DateField.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/document/DateTools.h,src/core/CLucene/document/DateTools.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/document/Document.h,src/core/CLucene/document/Document.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/document/Field.h,src/core/CLucene/document/Field.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/document/NumberTools.h,src/core/CLucene/document/NumberTools.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/index/DirectoryIndexReader.h,src/core/CLucene/index/DirectoryIndexReader.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/index/Terms.h,src/core/CLucene/index/Terms.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/index/IndexDeletionPolicy.h,src/core/CLucene/index/IndexDeletionPolicy.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/index/MultipleTermPositions.h,src/core/CLucene/index/MultipleTermPositions.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/index/Term.h,src/core/CLucene/index/Term.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/index/IndexModifier.h,src/core/CLucene/index/IndexModifier.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/index/Payload.h,src/core/CLucene/index/Payload.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/index/MultiReader.h,src/core/CLucene/index/MultiReader.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/index/MergeScheduler.h,src/core/CLucene/index/MergeScheduler.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/index/TermVector.h,src/core/CLucene/index/TermVector.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/index/MergePolicy.h,src/core/CLucene/index/MergePolicy.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/index/IndexReader.h,src/core/CLucene/index/IndexReader.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/index/IndexWriter.h,src/core/CLucene/index/IndexWriter.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/search/BooleanClause.h,src/core/CLucene/search/BooleanClause.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/search/BooleanQuery.h,src/core/CLucene/search/BooleanQuery.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/search/DateFilter.h,src/core/CLucene/search/DateFilter.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/search/Explanation.h,src/core/CLucene/search/Explanation.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/search/Hits.h,src/core/CLucene/search/Hits.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/search/IndexSearcher.h,src/core/CLucene/search/IndexSearcher.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/search/FilteredTermEnum.h,src/core/CLucene/search/FilteredTermEnum.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/search/FuzzyQuery.h,src/core/CLucene/search/FuzzyQuery.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/search/MultiSearcher.h,src/core/CLucene/search/MultiSearcher.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/search/MultiTermQuery.h,src/core/CLucene/search/MultiTermQuery.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/search/Searchable.h,src/core/CLucene/search/Searchable.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/search/SearchHeader.h,src/core/CLucene/search/SearchHeader.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/search/Similarity.h,src/core/CLucene/search/Similarity.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/search/Sort.h,src/core/CLucene/search/Sort.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/search/spans/SpanTermQuery.h,src/core/CLucene/search/spans/SpanTermQuery.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/search/spans/SpanQuery.h,src/core/CLucene/search/spans/SpanQuery.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/search/spans/SpanNotQuery.h,src/core/CLucene/search/spans/SpanNotQuery.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/search/spans/SpanScorer.h,src/core/CLucene/search/spans/SpanScorer.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/search/spans/SpanFirstQuery.h,src/core/CLucene/search/spans/SpanFirstQuery.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/search/spans/SpanNearQuery.h,src/core/CLucene/search/spans/SpanNearQuery.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/search/spans/SpanOrQuery.h,src/core/CLucene/search/spans/SpanOrQuery.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/search/spans/Spans.h,src/core/CLucene/search/spans/Spans.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/search/spans/SpanWeight.h,src/core/CLucene/search/spans/SpanWeight.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/search/Filter.h,src/core/CLucene/search/Filter.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/search/FieldSortedHitQueue.h,src/core/CLucene/search/FieldSortedHitQueue.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/search/PhraseQuery.h,src/core/CLucene/search/PhraseQuery.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/search/PrefixQuery.h,src/core/CLucene/search/PrefixQuery.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/search/Query.h,src/core/CLucene/search/Query.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/search/RangeQuery.h,src/core/CLucene/search/RangeQuery.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/search/SpanQueryFilter.h,src/core/CLucene/search/SpanQueryFilter.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/search/TermQuery.h,src/core/CLucene/search/TermQuery.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/search/MultiPhraseQuery.h,src/core/CLucene/search/MultiPhraseQuery.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/search/WildcardQuery.h,src/core/CLucene/search/WildcardQuery.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/CLConfig.h,src/core/CLucene/CLConfig.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/util/VoidList.h,src/core/CLucene/util/VoidList.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/util/Reader.h,src/core/CLucene/util/Reader.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/util/VoidMap.h,src/core/CLucene/util/VoidMap.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/util/CLStreams.h,src/core/CLucene/util/CLStreams.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/util/Array.h,src/core/CLucene/util/Array.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/util/PriorityQueue.h,src/core/CLucene/util/PriorityQueue.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/util/BitSet.h,src/core/CLucene/util/BitSet.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/util/Equators.h,src/core/CLucene/util/Equators.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/queryParser/QueryParserConstants.h,src/core/CLucene/queryParser/QueryParserConstants.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/queryParser/QueryToken.h,src/core/CLucene/queryParser/QueryToken.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/queryParser/legacy/QueryToken.h,src/core/CLucene/queryParser/legacy/QueryToken.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/queryParser/legacy/MultiFieldQueryParser.h,src/core/CLucene/queryParser/legacy/MultiFieldQueryParser.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/queryParser/legacy/QueryParser.h,src/core/CLucene/queryParser/legacy/QueryParser.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/queryParser/MultiFieldQueryParser.h,src/core/CLucene/queryParser/MultiFieldQueryParser.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/queryParser/QueryParserTokenManager.h,src/core/CLucene/queryParser/QueryParserTokenManager.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/queryParser/QueryParser.h,src/core/CLucene/queryParser/QueryParser.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/LuceneThreads.h,src/shared/CLucene/LuceneThreads.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/store/LockFactory.h,src/core/CLucene/store/LockFactory.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/store/Lock.h,src/core/CLucene/store/Lock.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/store/Directory.h,src/core/CLucene/store/Directory.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/store/RAMDirectory.h,src/core/CLucene/store/RAMDirectory.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/store/IndexInput.h,src/core/CLucene/store/IndexInput.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/store/FSDirectory.h,src/core/CLucene/store/FSDirectory.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/store/IndexOutput.h,src/core/CLucene/store/IndexOutput.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/StdHeader.h,src/core/CLucene/StdHeader.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/debug/error.h,src/core/CLucene/debug/error.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/debug/mem.h,src/core/CLucene/debug/mem.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/debug/lucenebase.h,src/core/CLucene/debug/lucenebase.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/analysis/CachingTokenFilter.h,src/core/CLucene/analysis/CachingTokenFilter.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/analysis/AnalysisHeader.h,src/core/CLucene/analysis/AnalysisHeader.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/analysis/Analyzers.h,src/core/CLucene/analysis/Analyzers.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/analysis/standard/StandardTokenizer.h,src/core/CLucene/analysis/standard/StandardTokenizer.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/analysis/standard/StandardFilter.h,src/core/CLucene/analysis/standard/StandardFilter.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/analysis/standard/StandardTokenizerConstants.h,src/core/CLucene/analysis/standard/StandardTokenizerConstants.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/analysis/standard/StandardAnalyzer.h,src/core/CLucene/analysis/standard/StandardAnalyzer.h))
-$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/analysis/LanguageBasedAnalyzer.h,src/contribs-lib/CLucene/analysis/LanguageBasedAnalyzer.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene.h,src/core/CLucene.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/clucene-config.h,src/shared/CLucene/clucene-config.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/SharedHeader.h,src/shared/CLucene/SharedHeader.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/document/DateField.h,src/core/CLucene/document/DateField.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/document/DateTools.h,src/core/CLucene/document/DateTools.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/document/Document.h,src/core/CLucene/document/Document.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/document/Field.h,src/core/CLucene/document/Field.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/document/NumberTools.h,src/core/CLucene/document/NumberTools.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/index/DirectoryIndexReader.h,src/core/CLucene/index/DirectoryIndexReader.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/index/Terms.h,src/core/CLucene/index/Terms.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/index/IndexDeletionPolicy.h,src/core/CLucene/index/IndexDeletionPolicy.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/index/MultipleTermPositions.h,src/core/CLucene/index/MultipleTermPositions.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/index/Term.h,src/core/CLucene/index/Term.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/index/IndexModifier.h,src/core/CLucene/index/IndexModifier.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/index/Payload.h,src/core/CLucene/index/Payload.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/index/MultiReader.h,src/core/CLucene/index/MultiReader.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/index/MergeScheduler.h,src/core/CLucene/index/MergeScheduler.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/index/TermVector.h,src/core/CLucene/index/TermVector.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/index/MergePolicy.h,src/core/CLucene/index/MergePolicy.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/index/IndexReader.h,src/core/CLucene/index/IndexReader.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/index/IndexWriter.h,src/core/CLucene/index/IndexWriter.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/search/BooleanClause.h,src/core/CLucene/search/BooleanClause.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/search/BooleanQuery.h,src/core/CLucene/search/BooleanQuery.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/search/DateFilter.h,src/core/CLucene/search/DateFilter.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/search/Explanation.h,src/core/CLucene/search/Explanation.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/search/Hits.h,src/core/CLucene/search/Hits.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/search/IndexSearcher.h,src/core/CLucene/search/IndexSearcher.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/search/FilteredTermEnum.h,src/core/CLucene/search/FilteredTermEnum.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/search/FuzzyQuery.h,src/core/CLucene/search/FuzzyQuery.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/search/MultiSearcher.h,src/core/CLucene/search/MultiSearcher.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/search/MultiTermQuery.h,src/core/CLucene/search/MultiTermQuery.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/search/Searchable.h,src/core/CLucene/search/Searchable.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/search/SearchHeader.h,src/core/CLucene/search/SearchHeader.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/search/Similarity.h,src/core/CLucene/search/Similarity.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/search/Sort.h,src/core/CLucene/search/Sort.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/search/spans/SpanTermQuery.h,src/core/CLucene/search/spans/SpanTermQuery.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/search/spans/SpanQuery.h,src/core/CLucene/search/spans/SpanQuery.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/search/spans/SpanNotQuery.h,src/core/CLucene/search/spans/SpanNotQuery.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/search/spans/SpanScorer.h,src/core/CLucene/search/spans/SpanScorer.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/search/spans/SpanFirstQuery.h,src/core/CLucene/search/spans/SpanFirstQuery.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/search/spans/SpanNearQuery.h,src/core/CLucene/search/spans/SpanNearQuery.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/search/spans/SpanOrQuery.h,src/core/CLucene/search/spans/SpanOrQuery.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/search/spans/Spans.h,src/core/CLucene/search/spans/Spans.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/search/spans/SpanWeight.h,src/core/CLucene/search/spans/SpanWeight.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/search/Filter.h,src/core/CLucene/search/Filter.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/search/FieldSortedHitQueue.h,src/core/CLucene/search/FieldSortedHitQueue.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/search/PhraseQuery.h,src/core/CLucene/search/PhraseQuery.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/search/PrefixQuery.h,src/core/CLucene/search/PrefixQuery.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/search/Query.h,src/core/CLucene/search/Query.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/search/RangeQuery.h,src/core/CLucene/search/RangeQuery.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/search/SpanQueryFilter.h,src/core/CLucene/search/SpanQueryFilter.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/search/TermQuery.h,src/core/CLucene/search/TermQuery.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/search/MultiPhraseQuery.h,src/core/CLucene/search/MultiPhraseQuery.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/search/WildcardQuery.h,src/core/CLucene/search/WildcardQuery.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/CLConfig.h,src/core/CLucene/CLConfig.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/util/VoidList.h,src/core/CLucene/util/VoidList.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/util/Reader.h,src/core/CLucene/util/Reader.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/util/VoidMap.h,src/core/CLucene/util/VoidMap.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/util/CLStreams.h,src/core/CLucene/util/CLStreams.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/util/Array.h,src/core/CLucene/util/Array.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/util/PriorityQueue.h,src/core/CLucene/util/PriorityQueue.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/util/BitSet.h,src/core/CLucene/util/BitSet.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/util/Equators.h,src/core/CLucene/util/Equators.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/queryParser/QueryParserConstants.h,src/core/CLucene/queryParser/QueryParserConstants.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/queryParser/QueryToken.h,src/core/CLucene/queryParser/QueryToken.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/queryParser/legacy/QueryToken.h,src/core/CLucene/queryParser/legacy/QueryToken.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/queryParser/legacy/MultiFieldQueryParser.h,src/core/CLucene/queryParser/legacy/MultiFieldQueryParser.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/queryParser/legacy/QueryParser.h,src/core/CLucene/queryParser/legacy/QueryParser.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/queryParser/MultiFieldQueryParser.h,src/core/CLucene/queryParser/MultiFieldQueryParser.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/queryParser/QueryParserTokenManager.h,src/core/CLucene/queryParser/QueryParserTokenManager.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/queryParser/QueryParser.h,src/core/CLucene/queryParser/QueryParser.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/LuceneThreads.h,src/shared/CLucene/LuceneThreads.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/store/LockFactory.h,src/core/CLucene/store/LockFactory.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/store/Lock.h,src/core/CLucene/store/Lock.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/store/Directory.h,src/core/CLucene/store/Directory.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/store/RAMDirectory.h,src/core/CLucene/store/RAMDirectory.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/store/IndexInput.h,src/core/CLucene/store/IndexInput.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/store/FSDirectory.h,src/core/CLucene/store/FSDirectory.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/store/IndexOutput.h,src/core/CLucene/store/IndexOutput.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/StdHeader.h,src/core/CLucene/StdHeader.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/debug/error.h,src/core/CLucene/debug/error.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/debug/mem.h,src/core/CLucene/debug/mem.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/debug/lucenebase.h,src/core/CLucene/debug/lucenebase.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/analysis/CachingTokenFilter.h,src/core/CLucene/analysis/CachingTokenFilter.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/analysis/AnalysisHeader.h,src/core/CLucene/analysis/AnalysisHeader.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/analysis/Analyzers.h,src/core/CLucene/analysis/Analyzers.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/analysis/standard/StandardTokenizer.h,src/core/CLucene/analysis/standard/StandardTokenizer.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/analysis/standard/StandardFilter.h,src/core/CLucene/analysis/standard/StandardFilter.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/analysis/standard/StandardTokenizerConstants.h,src/core/CLucene/analysis/standard/StandardTokenizerConstants.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/analysis/standard/StandardAnalyzer.h,src/core/CLucene/analysis/standard/StandardAnalyzer.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/analysis/LanguageBasedAnalyzer.h,src/contribs-lib/CLucene/analysis/LanguageBasedAnalyzer.h))
# vim: set noet sw=4 ts=4:
More information about the Libreoffice-commits
mailing list