[Libreoffice-commits] .: 3 commits - lucene/long_path.patch lucene/lucene.patch lucene/makefile.mk lucene/prj lucene/README lucene/version.mk sw/source test/source
Caolán McNamara
caolan at kemper.freedesktop.org
Fri May 18 06:18:13 PDT 2012
lucene/README | 1
lucene/long_path.patch | 37 ----------------
lucene/lucene.patch | 12 -----
lucene/makefile.mk | 74 --------------------------------
lucene/prj/build.lst | 3 -
lucene/prj/d.lst | 3 -
lucene/version.mk | 27 -----------
sw/source/core/doc/doctxm.cxx | 4 -
sw/source/ui/dialog/wordcountdialog.cxx | 6 ++
test/source/text/xtextcontent.cxx | 6 +-
10 files changed, 11 insertions(+), 162 deletions(-)
New commits:
commit 101149d80303848971463a22976c52a370c46c05
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri May 18 14:15:14 2012 +0100
WaE: make test msvc2008 warnings free
Change-Id: Ieccb0e425cb505bec3735539ebdf154529fde330
diff --git a/test/source/text/xtextcontent.cxx b/test/source/text/xtextcontent.cxx
index 8e84dc2..86a811f 100644
--- a/test/source/text/xtextcontent.cxx
+++ b/test/source/text/xtextcontent.cxx
@@ -39,7 +39,7 @@ namespace apitest {
void XTextContent::testGetAnchor()
{
uno::Reference< text::XTextContent > xTextContent(init(), UNO_QUERY_THROW);
- uno::Reference< uno::XInterface > xAnchor = xTextContent->getAnchor();
+ uno::Reference< uno::XInterface > xAnchor(xTextContent->getAnchor());
CPPUNIT_ASSERT(xAnchor.is());
}
@@ -58,13 +58,13 @@ void XTextContent::testAttach()
else
xTextContent->attach(xRange);
}
- catch (const lang::IllegalArgumentException& e)
+ catch (const lang::IllegalArgumentException&)
{
bool bAttachSupported = isAttachSupported();
if (bAttachSupported)
CPPUNIT_ASSERT(false);
}
- catch (const RuntimeException& e)
+ catch (const RuntimeException&)
{
bool bAttachSupported = isAttachSupported();
if (bAttachSupported)
commit bcfc9fc3bb3ebc8c6c88349e1c0c530208949e70
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri May 18 13:38:01 2012 +0100
WaE: make sw msvc2008 warnings free
Change-Id: I348a59b3c1b060a084680328aa07089b3c7ccc66
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index 8244b2d..426ecf8 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -986,7 +986,7 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr,
// Generate: Evaluate Form and insert the place holder for the
// page number. If it is a TOX_INDEX and the SwForm IsCommaSeparated()
// then a range of entries must be generated into one paragraph
- sal_uInt16 nRange = 1;
+ size_t nRange = 1;
if(TOX_INDEX == SwTOXBase::GetType() &&
GetTOXForm().IsCommaSeparated() &&
aSortArr[nCnt]->GetType() == TOX_SORT_INDEX)
@@ -1878,7 +1878,7 @@ void SwTOXBaseSection::UpdatePageNum()
GetOptions() : 0,
GetSortAlgorithm() );
- for( sal_uInt16 nCnt = 0; nCnt < aSortArr.size(); ++nCnt )
+ for( size_t nCnt = 0; nCnt < aSortArr.size(); ++nCnt )
{
// Loop over all SourceNodes
std::vector<sal_uInt16> aNums; // the PageNumber
diff --git a/sw/source/ui/dialog/wordcountdialog.cxx b/sw/source/ui/dialog/wordcountdialog.cxx
index f5b1c3b..967733d 100644
--- a/sw/source/ui/dialog/wordcountdialog.cxx
+++ b/sw/source/ui/dialog/wordcountdialog.cxx
@@ -104,7 +104,13 @@ SwWordCountFloatDlg::SwWordCountFloatDlg(SfxBindings* _pBindings,
Window *pParent,
SfxChildWinInfo* pInfo)
: SfxModelessDialog(_pBindings, pChild, pParent, SW_RES(DLG_WORDCOUNT)),
+#if defined _MSC_VER
+#pragma warning (disable : 4355)
+#endif
aDlg(this)
+#if defined _MSC_VER
+#pragma warning (default : 4355)
+#endif
{
FreeResource();
Initialize(pInfo);
commit 15a2cdb68eb1e6696cf5b33d2a05a325216e0b85
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri May 18 13:25:40 2012 +0100
forgot to remove lucene post clucene replacement
Change-Id: Ib68cbc8cbbd2b2b0b6f6069a3c6834c33eff8756
diff --git a/lucene/README b/lucene/README
deleted file mode 100644
index 3948ffc..0000000
--- a/lucene/README
+++ /dev/null
@@ -1 +0,0 @@
-From [http://lucene.apache.org/]. (CH: What of it is used for what ???)
diff --git a/lucene/long_path.patch b/lucene/long_path.patch
deleted file mode 100644
index d3ab8e3..0000000
--- a/lucene/long_path.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- misc/lucene-2.3.2/src/java/org/apache/lucene/store/FSDirectory.java 2008-05-01 22:27:58.000000000 +0200
-+++ misc/build/lucene-2.3.2/src/java/org/apache/lucene/store/FSDirectory.java 2011-02-23 16:36:26.249515000 +0100
-@@ -165,7 +165,15 @@
- public static FSDirectory getDirectory(File file, LockFactory lockFactory)
- throws IOException
- {
-- file = new File(file.getCanonicalPath());
-+ String path = file.getPath();
-+ //File.getCanonicalPath fails on Windows with long path names
-+ //Tested with Java SE 6u23
-+ //Long path names created by osl_getSystemPathFromFileURL are already
-+ //unique because its implementation replaces the occurrences of .. and .
-+ //That is using the com.sun.star.help.HelpIndexer service from c++ is
-+ //relatively safe.
-+ if (!path.startsWith("\\\\?\\"))
-+ file = new File(file.getCanonicalPath());
-
- if (file.exists() && !file.isDirectory())
- throw new IOException(file + " not a directory");
-@@ -455,7 +463,16 @@
- public String getLockID() {
- String dirName; // name to be hashed
- try {
-- dirName = directory.getCanonicalPath();
-+ //File.getCanonicalPath fails on Windows with long path names
-+ //Tested with Java SE 6u23
-+ //Long path names created by osl_getSystemPathFromFileURL are already
-+ //unique because its implementation replaces the occurrences of .. and .
-+ //That is using the com.sun.star.help.HelpIndexer service from c++ is
-+ //relatively safe.
-+ if (!directory.getPath().startsWith("\\\\?\\"))
-+ dirName = directory.getCanonicalPath();
-+ else
-+ dirName = directory.getPath();
- } catch (IOException e) {
- throw new RuntimeException(e.toString(), e);
- }
diff --git a/lucene/lucene.patch b/lucene/lucene.patch
deleted file mode 100644
index 3acd21e..0000000
--- a/lucene/lucene.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- lucene-2.3.2/common-build.xml 2008-05-01 22:28:56.000000000 +0200
-+++ misc/build/lucene-2.3.2/common-build.xml 2008-06-16 16:01:28.812500000 +0200
-@@ -280 +280 @@
-- value="${version} ${svnversion} - ${user.name} - ${DSTAMP} ${TSTAMP}"/>
-+ value="${version}"/>
-@@ -297,6 +296,0 @@
-- <!-- If possible, include the svnversion -->
-- <exec dir="." executable="svnversion"
-- outputproperty="svnversion" failifexecutionfails="false">
-- <arg line="."/>
-- </exec>
--
diff --git a/lucene/makefile.mk b/lucene/makefile.mk
deleted file mode 100644
index 98fab3f..0000000
--- a/lucene/makefile.mk
+++ /dev/null
@@ -1,74 +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=so_lucene
-TARGET=so_lucene
-
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : antsettings.mk
-# --- Files --------------------------------------------------------
-
-.IF "$(SOLAR_JAVA)" != ""
-
-LUCENE_MAJOR=2
-LUCENE_MINOR=3
-LUCENE_MICRO=2
-
-LUCENE_NAME=lucene-$(LUCENE_MAJOR).$(LUCENE_MINOR).$(LUCENE_MICRO)
-# NOTE that the jar names do not contain the micro version
-LUCENE_CORE_JAR=lucene-core-$(LUCENE_MAJOR).$(LUCENE_MINOR).jar
-LUCENE_ANALYZERS_JAR=lucene-analyzers-$(LUCENE_MAJOR).$(LUCENE_MINOR).jar
-
-TARFILE_NAME=$(LUCENE_NAME)
-TARFILE_MD5=48d8169acc35f97e05d8dcdfd45be7f2
-PATCH_FILES=lucene.patch
-
-.IF "$(OS)" == "WNT"
-PATCH_FILES+= long_path.patch
-.ENDIF
-
-
-BUILD_DIR=.
-BUILD_ACTION= ${ANT} -buildfile .$/contrib$/analyzers$/build.xml
-
-OUT2BIN=.$/build$/$(LUCENE_CORE_JAR) .$/build$/contrib$/analyzers$/$(LUCENE_ANALYZERS_JAR)
-
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-
-.IF "$(SOLAR_JAVA)" != ""
-.INCLUDE : tg_ext.mk
-.ENDIF
diff --git a/lucene/prj/build.lst b/lucene/prj/build.lst
deleted file mode 100644
index 9f51b60..0000000
--- a/lucene/prj/build.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-xh lucene : soltools EXPAT:expat NULL
-xh lucene usr1 - all xh_mkout NULL
-xh lucene nmake - all xh_lucene NULL
diff --git a/lucene/prj/d.lst b/lucene/prj/d.lst
deleted file mode 100644
index 97c8968..0000000
--- a/lucene/prj/d.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-mkdir: %_DEST%\inc\external
-mkdir: %_DEST%\inc\external\lucene
-..\%__SRC%\bin\lucene-*.jar %_DEST%\bin\lucene-*.jar
diff --git a/lucene/prj/dmake b/lucene/prj/dmake
deleted file mode 100644
index e69de29..0000000
diff --git a/lucene/version.mk b/lucene/version.mk
deleted file mode 100644
index fe9f60b..0000000
--- a/lucene/version.mk
+++ /dev/null
@@ -1,27 +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.
-#
-#*************************************************************************
-
More information about the Libreoffice-commits
mailing list