[Libreoffice-commits] .: 3 commits - editeng/source icc/makefile.mk icc/makefiles.zip icc/SampleICC-makefiles.patch icc/source sc/source smoketestoo_native/data unusedcode.easy
Caolán McNamara
caolan at kemper.freedesktop.org
Fri Nov 4 02:42:45 PDT 2011
dev/null |binary
editeng/source/editeng/impedit.hxx | 4
editeng/source/editeng/impedit2.cxx | 14 --
editeng/source/editeng/impedit3.cxx | 9 -
editeng/source/editeng/impedit4.cxx | 5
icc/SampleICC-makefiles.patch | 176 +++++++++++++++++++++++++++++
icc/makefile.mk | 3
icc/source/create_sRGB_profile/makefile.mk | 78 ++++++++++++
sc/source/ui/inc/invmerge.hxx | 2
sc/source/ui/view/invmerge.cxx | 12 -
smoketestoo_native/data/Global.xml | 5
unusedcode.easy | 6
12 files changed, 266 insertions(+), 48 deletions(-)
New commits:
commit edf50b4d4fe0b1a2b0a670f896dc2301caf14212
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Nov 4 09:24:32 2011 +0000
binfilter test needs to have SOLARSRC set to find sample docs
diff --git a/smoketestoo_native/data/Global.xml b/smoketestoo_native/data/Global.xml
index e956f45..8c549f8 100644
--- a/smoketestoo_native/data/Global.xml
+++ b/smoketestoo_native/data/Global.xml
@@ -120,7 +120,10 @@ Dim gDlgState as Integer
Sub SetGlobalDoc
gOutputDoc = ThisComponent
- oBinFilterComp = createUnoService( "com.sun.star.comp.office.BF_MigrateFilter" )
+ REM need to have the binfilter component, and SOLARSRC set to find sample docs
+ if Environ("SOLARSRC") <> "" then
+ oBinFilterComp = createUnoService( "com.sun.star.comp.office.BF_MigrateFilter" )
+ End If
end Sub
Sub ClearStatus
commit b70fbfd9265d46a0bc088ff08b52fd78268a4834
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Nov 4 09:10:42 2011 +0000
update unused list
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index 1cf6002..adf3c8e 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -597,7 +597,6 @@ private:
EditPaM ConnectContents( sal_uInt16 nLeftNode, sal_Bool bBackward );
void ShowParagraph( sal_uInt16 nParagraph, sal_Bool bShow );
- sal_Bool IsParagraphVisible( sal_uInt16 nParagraph );
EditPaM PageUp( const EditPaM& rPaM, EditView* pView);
EditPaM PageDown( const EditPaM& rPaM, EditView* pView);
@@ -830,7 +829,6 @@ public:
sal_Bool IsInSelectionMode() { return bInSelection; }
- void StopSelectionMode();
void IndentBlock( EditView* pView, sal_Bool bRight );
@@ -952,8 +950,6 @@ public:
void PutSpellingToSentenceStart( EditView& rEditView );
//applies a changed sentence
void ApplyChangedSentence(EditView& rEditView, const ::svx::SpellPortions& rNewPortions, bool bRecheck );
- //deinitialize sentence spelling
- void EndSpelling();
//adds one or more portions of text to the SpellPortions depending on language changes
void AddPortionIterated(
EditView& rEditView,
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index 297b06a..74d096c 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -3555,20 +3555,6 @@ EditSelection ImpEditEngine::MatchGroup( const EditSelection& rSel )
return aMatchSel;
}
-void ImpEditEngine::StopSelectionMode()
-{
- if ( ( IsInSelectionMode() || aSelEngine.IsInSelection() ) && pActiveView )
- {
- pActiveView->pImpEditView->DrawSelection();
- EditSelection aSel( pActiveView->pImpEditView->GetEditSelection() );
- aSel.Min() = aSel.Max();
- pActiveView->pImpEditView->SetEditSelection( aSel );
- pActiveView->ShowCursor();
- aSelEngine.Reset();
- bInSelection = sal_False;
- }
-}
-
void ImpEditEngine::SetActiveView( EditView* pView )
{
// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index 8f059a3..83695cf 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -3806,15 +3806,6 @@ void ImpEditEngine::ShowParagraph( sal_uInt16 nParagraph, sal_Bool bShow )
}
}
-sal_Bool ImpEditEngine::IsParagraphVisible( sal_uInt16 nParagraph )
-{
- ParaPortion* pPPortion = GetParaPortions().SaveGetObject( nParagraph );
- DBG_ASSERT( pPPortion, "IsParagraphVisible: Paragraph does not exist! ");
- if ( pPPortion )
- return pPPortion->IsVisible();
- return sal_False;
-}
-
EditSelection ImpEditEngine::MoveParagraphs( Range aOldPositions, sal_uInt16 nNewPos, EditView* pCurView )
{
DBG_ASSERT( GetParaPortions().Count() != 0, "No paragraphs found: MoveParagraphs" );
diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx
index 80dcedc..27bbcdc 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -1869,11 +1869,6 @@ Reference< XSpellAlternatives > ImpEditEngine::ImpSpell( EditView* pEditView )
return xSpellAlt;
}
-void ImpEditEngine::EndSpelling()
-{
- DELETEZ(pSpellInfo);
-}
-
void ImpEditEngine::StartSpelling(EditView& rEditView, sal_Bool bMultipleDoc)
{
DBG_ASSERT(!pSpellInfo, "pSpellInfo already set?");
diff --git a/sc/source/ui/inc/invmerge.hxx b/sc/source/ui/inc/invmerge.hxx
index ebe03a9..ccffe88 100644
--- a/sc/source/ui/inc/invmerge.hxx
+++ b/sc/source/ui/inc/invmerge.hxx
@@ -38,7 +38,6 @@ class Window;
class ScInvertMerger
{
private:
- Window* pWin;
::std::vector< Rectangle >* pRects;
Rectangle aTotalRect;
Rectangle aLineRect;
@@ -47,7 +46,6 @@ private:
void FlushTotal();
public:
- ScInvertMerger( Window* pWindow );
ScInvertMerger( ::std::vector< Rectangle >* pRectangles );
~ScInvertMerger();
diff --git a/sc/source/ui/view/invmerge.cxx b/sc/source/ui/view/invmerge.cxx
index 8a8a885..82469a5 100644
--- a/sc/source/ui/view/invmerge.cxx
+++ b/sc/source/ui/view/invmerge.cxx
@@ -37,15 +37,7 @@
//------------------------------------------------------------------
-ScInvertMerger::ScInvertMerger( Window* pWindow ) :
- pWin( pWindow ),
- pRects( NULL )
-{
- // both rectangles empty
-}
-
ScInvertMerger::ScInvertMerger( ::std::vector< Rectangle >* pRectangles ) :
- pWin( NULL ),
pRects( pRectangles )
{
// collect rectangles instead of inverting
@@ -112,9 +104,7 @@ void ScInvertMerger::FlushTotal()
if( aTotalRect.IsEmpty() )
return; // nothing to do
- if ( pWin )
- pWin->Invert( aTotalRect, INVERT_HIGHLIGHT );
- else if ( pRects )
+ if ( pRects )
pRects->push_back( aTotalRect );
aTotalRect.SetEmpty();
diff --git a/unusedcode.easy b/unusedcode.easy
index a22c390..ce45052 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -402,8 +402,8 @@ ScDocument::IsLoadingMedium() const
ScDocument::ValidNewTabName(std::__debug::vector<String, std::allocator<String> > const&) const
ScExternalRefManager::setCacheTableReferencedPermanently(unsigned short, rtl::OUString const&, unsigned long)
ScFilterDetect::impl_createFactory(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
+ScFiltersTest::testPassword()
ScFormulaCell::ScFormulaCell()
-ScGridWindow::InvertSimple(short, int, short, int, unsigned char, unsigned char)
ScHTMLColOffset::Insert(ScHTMLColOffset const*, unsigned short, unsigned short)
ScHTMLColOffset::Insert(unsigned long const&, unsigned short&)
ScHTMLColOffset::Insert(unsigned long const*, unsigned short)
@@ -1351,6 +1351,9 @@ _ZSortFlys_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(_ZSor
avmedia::priv::MediaWindowBaseImpl::getStopTime() const
avmedia::priv::MediaWindowBaseImpl::setRate(double)
avmedia::priv::MediaWindowBaseImpl::setStopTime(double)
+basebmp::BitmapDevice::getPaletteEntryCount() const
+basebmp::BitmapDevice::getPixelData(basegfx::B2IPoint const&)
+basebmp::BitmapDevice::setDamageTracker(boost::shared_ptr<basebmp::IBitmapDeviceDamageTracker> const&)
basebmp::debugDump(boost::shared_ptr<basebmp::BitmapDevice> const&, std::basic_ostream<char, std::char_traits<char> >&)
basegfx::B1DRange::B1DRange(basegfx::B1IRange const&)
basegfx::B2DCubicBezier::B2DCubicBezier(basegfx::B2DPoint const&, basegfx::B2DPoint const&)
@@ -1432,6 +1435,7 @@ basegfx::average(basegfx::B2ITuple const&, basegfx::B2ITuple const&, basegfx::B2
basegfx::computeSetDifference(std::__debug::vector<basegfx::B2IBox, std::allocator<basegfx::B2IBox> >&, basegfx::B2IBox const&, basegfx::B2IBox const&)
basegfx::exportToSvg(basegfx::B2DHomMatrix const&)
basegfx::fround(basegfx::B1DRange const&)
+basegfx::fround(basegfx::B2DRange const&)
basegfx::fround(basegfx::B3DRange const&)
basegfx::getContinuity(basegfx::B2IVector const&, basegfx::B2IVector const&)
basegfx::getOrientation(basegfx::B2IVector const&, basegfx::B2IVector const&)
commit 3f8126822c5cb4348f769d9a0776d457f5587b58
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Nov 4 09:09:40 2011 +0000
convert zip of makefiles.mk to a patch and skip building some we don't need
diff --git a/icc/SampleICC-makefiles.patch b/icc/SampleICC-makefiles.patch
new file mode 100644
index 0000000..8b2781c
--- /dev/null
+++ b/icc/SampleICC-makefiles.patch
@@ -0,0 +1,176 @@
+--- /dev/null 2011-10-28 11:24:51.341910850 +0100
++++ misc/build/SampleICC-1.3.2/makefile.mk 2008-04-04 14:47:18.000000000 +0100
+@@ -0,0 +1,47 @@
++#*************************************************************************
++#
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++#
++# Copyright 2008 by Sun Microsystems, Inc.
++#
++# OpenOffice.org - a multi-platform office productivity suite
++#
++# $RCSfile: makefile.mk,v $
++#
++# $Revision: 1.21 $
++#
++# 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=icc
++TARGET=create_sRGB_profile
++
++# --- Settings -----------------------------------------------------
++
++.INCLUDE : settings.mk
++
++.INCLUDE : target.mk
++
++ALLTAR: Contrib$/CmdLine$/create_sRGB_profile$/$(TARGET)$(EXECPOST)
++
++Contrib$/CmdLine$/create_sRGB_profile$/$(TARGET)$(EXECPOST) .PHONY:
++ cd IccProfLib && dmake && cd ..$/Contrib$/ICC_utils && dmake && cd ..$/CmdLine$/create_sRGB_profile && dmake
++
+--- /dev/null 2011-10-28 11:24:51.341910850 +0100
++++ misc/build/SampleICC-1.3.2/Contrib/ICC_utils/makefile.mk 2011-11-04 08:50:20.000000000 +0000
+@@ -0,0 +1,57 @@
++#*************************************************************************
++#
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++#
++# Copyright 2008 by Sun Microsystems, Inc.
++#
++# OpenOffice.org - a multi-platform office productivity suite
++#
++# $RCSfile: makefile.mk,v $
++#
++# $Revision: 1.21 $
++#
++# 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=icc
++TARGET=icutil
++ENABLE_EXCEPTIONS=TRUE
++
++EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
++
++# --- Settings -----------------------------------------------------
++
++.INCLUDE : settings.mk
++
++CFLAGS+=-I..$/..$/IccProfLib
++
++# --- Files --------------------------------------------------------
++
++SLOFILES=\
++ $(SLO)$/CAT.obj \
++ $(SLO)$/ICC_tool_exception.obj \
++ $(SLO)$/Stubs.obj \
++ $(SLO)$/Vetters.obj
++
++# --- Targets ------------------------------------------------------
++
++.INCLUDE : target.mk
++
+--- /dev/null 2011-10-28 11:24:51.341910850 +0100
++++ misc/build/SampleICC-1.3.2/IccProfLib/makefile.mk 2011-11-04 08:51:29.000000000 +0000
+@@ -0,0 +1,63 @@
++#*************************************************************************
++#
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++#
++# Copyright 2008 by Sun Microsystems, Inc.
++#
++# OpenOffice.org - a multi-platform office productivity suite
++#
++# $RCSfile: makefile.mk,v $
++#
++# $Revision: 1.31 $
++#
++# 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=icc
++TARGET=proflib
++
++EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
++ENABLE_EXCEPTIONS=TRUE
++
++# --- Settings -----------------------------------------------------
++
++.INCLUDE : settings.mk
++
++# --- Files --------------------------------------------------------
++
++SLOFILES=\
++ $(SLO)$/IccIO.obj \
++ $(SLO)$/IccMpeACS.obj \
++ $(SLO)$/IccMpeBasic.obj \
++ $(SLO)$/IccMpeFactory.obj \
++ $(SLO)$/IccProfile.obj \
++ $(SLO)$/IccTagBasic.obj \
++ $(SLO)$/IccTagFactory.obj \
++ $(SLO)$/IccTagLut.obj \
++ $(SLO)$/IccTagMPE.obj \
++ $(SLO)$/IccTagProfSeqId.obj \
++ $(SLO)$/IccUtil.obj \
++ $(SLO)$/md5.obj
++
++# --- Targets ------------------------------------------------------
++
++.INCLUDE : target.mk
++
diff --git a/icc/makefile.mk b/icc/makefile.mk
index 779def4..8bf13c3 100644
--- a/icc/makefile.mk
+++ b/icc/makefile.mk
@@ -39,6 +39,7 @@ TARGET=icc
TARFILE_NAME=SampleICC-1.3.2
TARFILE_MD5=fdb27bfe2dbe2e7b57ae194d9bf36bab
PATCH_FILES= \
+ SampleICC-makefiles.patch \
$(TARFILE_NAME).patch \
$(TARFILE_NAME)-fmtargs.patch
@@ -49,7 +50,7 @@ CONVERTFILES= \
Contrib$/ICC_utils$/Vetters.cpp
.IF "$(CROSS_COMPILING)"!="YES"
-CONFIGURE_ACTION= $(GNUCOPY) -r $(BACK_PATH)..$/source$/create_sRGB_profile Contrib$/CmdLine && unzip -o $(BACK_PATH)..$/makefiles.zip
+CONFIGURE_ACTION= $(GNUCOPY) -r $(BACK_PATH)..$/source$/create_sRGB_profile Contrib$/CmdLine
BUILD_ACTION=dmake && cd Contrib$/CmdLine$/create_sRGB_profile && $(AUGMENT_LIBRARY_PATH) .$/create_sRGB_profile
.ELSE
CONFIGURE_ACTION=
diff --git a/icc/makefiles.zip b/icc/makefiles.zip
deleted file mode 100644
index db08c73..0000000
Binary files a/icc/makefiles.zip and /dev/null differ
diff --git a/icc/source/create_sRGB_profile/makefile.mk b/icc/source/create_sRGB_profile/makefile.mk
new file mode 100644
index 0000000..8b687bb
--- /dev/null
+++ b/icc/source/create_sRGB_profile/makefile.mk
@@ -0,0 +1,78 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile: makefile.mk,v $
+#
+# $Revision: 1.21 $
+#
+# 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=icc
+TARGET=create_sRGB_profile
+LIBTARGET=NO
+TARGETTYPE=CUI
+
+ENABLE_EXCEPTIONS=TRUE
+
+EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE : settings.mk
+
+CFLAGS+=-I..$/..$/..$/IccProfLib -I..$/..$/ICC_utils
+
+# This tool uses unaligned memory accesses which will lead
+# to SIGBUS on platforms who care, like Solaris LP64
+.IF "$(OS)$(CPU)"=="SOLARISU"
+LINKFLAGS+=-xmemalign=8i
+.ENDIF
+
+# --- Files --------------------------------------------------------
+
+OBJFILES= $(OBJ)$/create_sRGB_profile.obj
+
+# --- Targets ------------------------------------------------------
+
+# svdem
+APP1LIBSALCPPRT:=
+UWINAPILIB:=
+APP1NOSAL= TRUE
+APP1TARGET= $(TARGET)
+APP1LIBS=\
+ $(SLB)$/proflib.lib \
+ $(SLB)$/icutil.lib
+APP1OBJS= $(OBJFILES)
+APP1STDLIBS=
+
+.INCLUDE : target.mk
+
+ALLTAR: $(TARGET)$(EXECPOST)
+
+$(TARGET)$(EXECPOST): $(BIN)$/$(TARGET)$(EXECPOST) makefile.mk
+ rm -f $@
+ $(GNUCOPY) $(BIN)$/$(TARGET)$(EXECPOST) $@
More information about the Libreoffice-commits
mailing list