[Libreoffice-commits] .: 3 commits - desktop/inc desktop/source sal/inc sal/qa sfx2/source vcl/aqua vcl/inc vcl/ios

2011-11-04 Thread Stephan Bergmann 
 desktop/inc/app.hxx  |1 
 desktop/source/app/app.cxx   |  259 +--
 desktop/source/app/cmdlineargs.cxx   |8 
 desktop/source/app/officeipcthread.cxx   |   36 -
 sal/inc/rtl/ustrbuf.hxx  |   18 
 sal/qa/rtl/oustringbuffer/makefile.mk|1 
 sal/qa/rtl/oustringbuffer/test_oustringbuffer_appendchar.cxx |   63 ++
 sfx2/source/appl/appdde.cxx  |   43 +
 vcl/aqua/source/app/vclnsapp.mm  |   18 
 vcl/aqua/source/window/salmenu.cxx   |   12 
 vcl/inc/vcl/svapp.hxx|  107 
 vcl/ios/source/app/vcluiapp.mm   |3 
 12 files changed, 285 insertions(+), 284 deletions(-)

New commits:
commit e66e54fb00bf74d13b7059bd32b6207a029afa5e
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Nov 3 17:45:47 2011 +0100

Further clean up of areas touched by previous commit.

diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index 87a774c..f30ac46 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -190,7 +190,6 @@ class Desktop : public Application
 voidDoFirstRunInitializations();
 
 static sal_Bool SaveTasks();
-static sal_Bool _bTasksSaved;
 
 static void retrieveCrashReporterState();
 static sal_Bool isUIOnSessionShutdownAllowed();
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 00850aa..110 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1346,8 +1346,6 @@ sal_Bool impl_callRecoveryUI(sal_Bool bEmergencySave ,
  *
  */
 
-sal_Bool Desktop::_bTasksSaved = sal_False;
-
 sal_Bool Desktop::SaveTasks()
 {
 return impl_callRecoveryUI(
@@ -2990,138 +2988,139 @@ String GetURL_Impl(
 
 void Desktop::HandleAppEvent( const ApplicationEvent rAppEvent )
 {
-if ( rAppEvent.GetEvent() == 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(APPEAR))  
!GetCommandLineArgs().IsInvisible() )
+switch ( rAppEvent.GetEvent() )
 {
-css::uno::Reference css::lang::XMultiServiceFactory  xSMGR = 
::comphelper::getProcessServiceFactory();
-
-// find active task - the active task is always a visible task
-::com::sun::star::uno::Reference 
::com::sun::star::frame::XFramesSupplier 
-xDesktop( xSMGR-createInstance( 
OUSTRING(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.frame.Desktop)) ),
-::com::sun::star::uno::UNO_QUERY );
-::com::sun::star::uno::Reference ::com::sun::star::frame::XFrame  
xTask = xDesktop-getActiveFrame();
-if ( !xTask.is() )
+case ApplicationEvent::TYPE_ACCEPT:
+// every time an accept parameter is used we create an acceptor
+// with the corresponding accept-string
+createAcceptor(rAppEvent.GetData());
+break;
+case ApplicationEvent::TYPE_APPEAR:
+if ( !GetCommandLineArgs().IsInvisible() )
 {
-// get any task if there is no active one
-::com::sun::star::uno::Reference 
::com::sun::star::container::XIndexAccess  xList( xDesktop-getFrames(), 
::com::sun::star::uno::UNO_QUERY );
-if ( xList-getCount()0 )
-xList-getByIndex(0) = xTask;
-}
+css::uno::Reference css::lang::XMultiServiceFactory  xSMGR = 
::comphelper::getProcessServiceFactory();
 
-if ( xTask.is() )
-{
-Reference com::sun::star::awt::XTopWindow  xTop( 
xTask-getContainerWindow(), UNO_QUERY );
-xTop-toFront();
-}
-else
-{
-// no visible task that could be activated found
-Reference XFrame  xBackingFrame;
-Reference ::com::sun::star::awt::XWindow  xContainerWindow;
-::com::sun::star::uno::Reference ::com::sun::star::frame::XFrame 
 xDesktopFrame( xDesktop, UNO_QUERY );
+// find active task - the active task is always a visible task
+::com::sun::star::uno::Reference 
::com::sun::star::frame::XFramesSupplier 
+  xDesktop( xSMGR-createInstance( 
OUSTRING(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.frame.Desktop)) ),
+::com::sun::star::uno::UNO_QUERY );
+::com::sun::star::uno::Reference ::com::sun::star::frame::XFrame 
 xTask = xDesktop-getActiveFrame();
+if ( !xTask.is() )
+{
+// get any task if there is no active one
+::com::sun::star::uno::Reference 
::com::sun::star::container::XIndexAccess  xList( xDesktop-getFrames(), 
::com::sun::star::uno::UNO_QUERY );
+if ( xList-getCount()0 )
+xList-getByIndex(0) = xTask;
+}
 
-xBackingFrame =

[Libreoffice-commits] .: wizards/com

2011-11-04 Thread Ivan Timofeev 
 wizards/com/sun/star/wizards/ui/event/DataAware.java|   11 ---
 wizards/com/sun/star/wizards/ui/event/MethodInvocation.java |   11 +++
 2 files changed, 7 insertions(+), 15 deletions(-)

New commits:
commit 504b384dd1c74838f34d5caa27f3e916bb309a8c
Author: Ivan Timofeev timofeev@gmail.com
Date:   Fri Nov 4 13:08:38 2011 +0400

suppress warnings about inexact argument type

diff --git a/wizards/com/sun/star/wizards/ui/event/DataAware.java 
b/wizards/com/sun/star/wizards/ui/event/DataAware.java
index be7260d..608203c 100644
--- a/wizards/com/sun/star/wizards/ui/event/DataAware.java
+++ b/wizards/com/sun/star/wizards/ui/event/DataAware.java
@@ -291,15 +291,12 @@ public abstract class DataAware {
  * @param obj the object which contains the property.
  * @return the get method reflection object.
  */
-private static Class[] EMPTY_ARRAY = new Class[0];
-
 protected Method createGetMethod(String propName, Object obj)
 {
 Method m = null;
 try
 { //try to get a get method.
-
-m = obj.getClass().getMethod(get + propName, EMPTY_ARRAY);
+m = obj.getClass().getMethod(get + propName, (Class[]) null);
 }
 catch (NoSuchMethodException ex1)
 {
@@ -307,13 +304,13 @@ public abstract class DataAware {
 }
 return m;
 }
-
+
 /* (non-Javadoc)
  * @see 
com.sun.star.wizards.ui.event.DataAware.Value#get(java.lang.Object)
  */
 public Object get(Object target) {
 try {
-return getMethod.invoke(target, EMPTY_ARRAY);
+return getMethod.invoke(target, (Object[]) null);
 } catch (IllegalAccessException ex1) {
 ex1.printStackTrace();
 } catch (InvocationTargetException ex2) {
@@ -329,7 +326,7 @@ public abstract class DataAware {
 return new short[0];
 }
 return null;
-
+
 }
 
 protected Method createSetMethod(String propName, Object obj, Class 
paramClass) {
diff --git a/wizards/com/sun/star/wizards/ui/event/MethodInvocation.java 
b/wizards/com/sun/star/wizards/ui/event/MethodInvocation.java
index adea073..621158e 100644
--- a/wizards/com/sun/star/wizards/ui/event/MethodInvocation.java
+++ b/wizards/com/sun/star/wizards/ui/event/MethodInvocation.java
@@ -42,10 +42,6 @@ import java.lang.reflect.Method;
  */
 public class MethodInvocation
 {
-
-static final Class[] EMPTY_ARRAY =
-{
-};
 //the method to invoke.
 Method mMethod;
 //the object to invoke the method on.
@@ -66,7 +62,7 @@ public class MethodInvocation
 
 public MethodInvocation(String methodName, Object obj, Class paramClass) 
throws NoSuchMethodException
 {
-this(paramClass == null ? obj.getClass().getMethod(methodName, null) : 
obj.getClass().getMethod(methodName, new Class[]
+this(paramClass == null ? obj.getClass().getMethod(methodName, 
(Class[]) null) : obj.getClass().getMethod(methodName, new Class[]
 {
 paramClass
 }), obj, paramClass);
@@ -86,12 +82,11 @@ public class MethodInvocation
 {
 if (mWithParam)
 {
-return mMethod.invoke(mObject, (Object) param
-);
+return mMethod.invoke(mObject, (Object) param);
 }
 else
 {
-return mMethod.invoke(mObject, EMPTY_ARRAY);
+return mMethod.invoke(mObject, (Object[]) null);
 }
 }
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[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

2011-11-04 Thread Caolán McNamara 
 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 caol...@redhat.com
Date:   Fri Nov 4 09:24:32 2011 +

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( 
quot;com.sun.star.comp.office.BF_MigrateFilterquot; )
+REM need to have the binfilter component, and SOLARSRC set to find sample 
docs
+if Environ(quot;SOLARSRCquot;) lt;gt; quot;quot; then
+oBinFilterComp = createUnoService( 
quot;com.sun.star.comp.office.BF_MigrateFilterquot; )
+End If
 end Sub
 
 Sub ClearStatus
commit b70fbfd9265d46a0bc088ff08b52fd78268a4834
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Nov 4 09:10:42 2011 +

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 );
 
 voidShowParagraph( sal_uInt16 nParagraph, sal_Bool bShow );
-sal_BoolIsParagraphVisible( sal_uInt16 nParagraph );
 
 EditPaM PageUp( const EditPaM rPaM, EditView* pView);
 EditPaM PageDown( const EditPaM rPaM, EditView* pView);
@@ -830,7 +829,6 @@ public:
 
 
 sal_BoolIsInSelectionMode() { return bInSelection; }
-voidStopSelectionMode();
 
 voidIndentBlock( EditView* pView, sal_Bool bRight );
 
@@ -952,8 +950,6 @@ public:
 voidPutSpellingToSentenceStart( EditView rEditView );
 //applies a changed sentence
 voidApplyChangedSentence(EditView rEditView, const 
::svx::SpellPortions rNewPortions, bool bRecheck );
-//deinitialize sentence spelling
-voidEndSpelling();
 //adds one or more portions of text to the SpellPortions depending on 
language changes
 voidAddPortionIterated(
 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
---

[Libreoffice-commits] .: solenv/gbuild

2011-11-04 Thread Tor Lillqvist 
 solenv/gbuild/platform/unxgcc.mk |   38 --
 1 file changed, 24 insertions(+), 14 deletions(-)

New commits:
commit d990bb8cd6d6e93c099c0bc196ef5b46a11f54c1
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Fri Nov 4 12:57:00 2011 +0200

Deduplication and generalization for cross-compilation

Introduce gb_Helper_LIBRARY_PATH_VAR that is the name of the
environment variable used to look up shared libraries, which differs
depending on OS_FOR_BUILD.

Set that environment variable instead of a hardcoded LD_LIBRARY_PATH
in gb_Helper_set_ld_path.

Make all the PRECOMMAND macros actually use gb_Helper_set_ld_path
instead of duplicating it.

This fixes cross-compilation to HOST platforms that use unxgcc.mk (for
instance Android) from BUILD platforms that don't (for instance
MacOSX).

diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index e3e168d..d61c914 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -213,7 +213,17 @@ gb_COMPILERNOOPTFLAGS := -O0
 
 gb_Helper_abbreviate_dirs_native = $(gb_Helper_abbreviate_dirs)
 
-gb_Helper_set_ld_path := LD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
+ifeq ($(OS_FOR_BUILD),MACOSX)
+gb_Helper_LIBRARY_PATH_VAR := DYLD_LIBRARY_PATH
+else ifeq ($(OS_FOR_BUILD),WNT)
+# In theory possible if cross-compiling to some Unix from Windows,
+# in practice strongly discouraged to even try that
+gb_Helper_LIBRARY_PATH_VAR := PATH
+else
+gb_Helper_LIBRARY_PATH_VAR := LD_LIBRARY_PATH
+endif
+
+gb_Helper_set_ld_path := $(gb_Helper_LIBRARY_PATH_VAR)=$(OUTDIR_FOR_BUILD)/lib
 
 # convert parameters filesystem root to native notation
 # does some real work only on windows, make sure not to
@@ -461,7 +471,7 @@ endef
 
 # CppunitTest class
 
-gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
+gb_CppunitTest_CPPTESTPRECOMMAND := $(gb_Helper_set_ld_path)
 gb_CppunitTest_SYSPRE := libtest_
 gb_CppunitTest_EXT := .so
 gb_CppunitTest_LIBDIR := $(gb_Helper_OUTDIRLIBDIR)
@@ -478,23 +488,23 @@ endef
 define gb_JunitTest_JunitTest_platform
 $(call gb_JunitTest_get_target,$(1)) : DEFS := \

-Dorg.openoffice.test.arg.soffice={OOO_TEST_SOFFICE:-path:$(OUTDIR)/installation/opt/program/soffice}
 \
-   -Dorg.openoffice.test.arg.env=LD_LIBRARY_PATH \
+   -Dorg.openoffice.test.arg.env=$(gb_Helper_LIBRARY_PATH_VAR) \
-Dorg.openoffice.test.arg.user=file://$(call 
gb_JunitTest_get_userdir,$(1)) \
 
 endef
 
 # SdiTarget class
 
-gb_SdiTarget_SVIDLPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
+gb_SdiTarget_SVIDLPRECOMMAND := $(gb_Helper_set_ld_path)
 
 # SrsPartMergeTarget
 
-gb_SrsPartMergeTarget_TRANSEXPRECOMMAND := 
LD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
+gb_SrsPartMergeTarget_TRANSEXPRECOMMAND := $(gb_Helper_set_ld_path)
 
 # SrsPartTarget class
 
 gb_SrsPartTarget_RSCTARGET := $(OUTDIR_FOR_BUILD)/bin/rsc
-gb_SrsPartTarget_RSCCOMMAND := LD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib 
SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(OUTDIR_FOR_BUILD)/bin/rsc
+gb_SrsPartTarget_RSCCOMMAND := $(gb_Helper_set_ld_path) 
SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(OUTDIR_FOR_BUILD)/bin/rsc
 
 define gb_SrsPartTarget__command_dep
 $(call gb_Helper_abbreviate_dirs,\
@@ -510,25 +520,25 @@ endef
 
 # ComponentTarget
 
-gb_XSLTPROCPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
+gb_XSLTPROCPRECOMMAND := $(gb_Helper_set_ld_path)
 
 # UnoApiTarget
 
 gb_UnoApiTarget_IDLCTARGET := $(OUTDIR)/bin/idlc
-gb_UnoApiTarget_IDLCCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib 
SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_IDLCTARGET)
+gb_UnoApiTarget_IDLCCOMMAND := $(gb_Helper_set_ld_path) 
SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_IDLCTARGET)
 gb_UnoApiTarget_REGMERGETARGET := $(OUTDIR)/bin/regmerge
-gb_UnoApiTarget_REGMERGECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib 
SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGMERGETARGET)
+gb_UnoApiTarget_REGMERGECOMMAND := $(gb_Helper_set_ld_path) 
SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGMERGETARGET)
 gb_UnoApiTarget_REGCOMPARETARGET := $(OUTDIR)/bin/regcompare
-gb_UnoApiTarget_REGCOMPARECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib 
SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGCOMPARETARGET)
+gb_UnoApiTarget_REGCOMPARECOMMAND := $(gb_Helper_set_ld_path) 
SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGCOMPARETARGET)
 gb_UnoApiTarget_CPPUMAKERTARGET := $(OUTDIR)/bin/cppumaker
-gb_UnoApiTarget_CPPUMAKERCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib 
SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_CPPUMAKERTARGET)
+gb_UnoApiTarget_CPPUMAKERCOMMAND := $(gb_Helper_set_ld_path) 
SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_CPPUMAKERTARGET)
 gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview
-gb_UnoApiTarget_REGVIEWCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib 
SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
+gb_UnoApiTarget_REGVIEWCOMMAND := $(gb_Helper_set_ld_path) 
SOLARBINDIR=$(OUTDIR)/bin

[Libreoffice-commits] .: postprocess/packcomponents scp2/source

2011-11-04 Thread Caolán McNamara 
 postprocess/packcomponents/makefile.mk |   11 +++
 scp2/source/ooo/file_library_ooo.scp   |6 +-
 scp2/source/ooo/makefile.mk|4 ++--
 3 files changed, 10 insertions(+), 11 deletions(-)

New commits:
commit 65270c4e9318036100401ec1fb09443c1bdb239a
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Nov 4 11:20:09 2011 +

fix encrypting odf documents

xsec_fw is always built, so always register and install
xsec_xmlsec is built when ENABLE_XMLSEC is true, match
register and install
plugin is built when WITH_MOZILLA is not NO, match
register

diff --git a/postprocess/packcomponents/makefile.mk 
b/postprocess/packcomponents/makefile.mk
index 9d36059..eb10ee9 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -277,10 +277,13 @@ my_components += \
 my_components += ldapbe2
 .END
 
-.IF $(ENABLE_NSS_MODULE) == YES || $(SYSTEM_MOZILLA) == YES
-my_components += \
-component/xmlsecurity/util/xsec_fw \
-pl
+.IF $(WITH_MOZILLA) != NO
+my_components += pl
+.END
+
+my_components += component/xmlsecurity/util/xsec_fw
+
+.IF $(ENABLE_XMLSEC) == YES
 .IF $(OS) == WNT
 my_components += component/xmlsecurity/util/xsec_xmlsec.windows
 .ELSE
diff --git a/scp2/source/ooo/file_library_ooo.scp 
b/scp2/source/ooo/file_library_ooo.scp
index d83d6cf..56592cf 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1406,7 +1406,6 @@ File gid_File_Lib_XSec_XMLSecurity
 Styles = (PACKED);
 End
 
-#if defined(ENABLE_NSS_MODULE) || defined(SYSTEM_MOZILLA)
 File gid_File_Lib_XSec_Framework
 TXT_FILE_BODY;
#ifdef UNX
@@ -1418,7 +1417,7 @@ File gid_File_Lib_XSec_Framework
 Styles = (PACKED);
 End
 
-#if defined(ENABLE_NSS_MODULE) || defined(SYSTEM_MOZILLA)
+#if defined(ENABLE_XMLSEC)
 File gid_File_Lib_XSec_XmlSec
 TXT_FILE_BODY;
 #ifdef UNX
@@ -1429,7 +1428,6 @@ File gid_File_Lib_XSec_XmlSec
 Dir = SCP2_OOO_BIN_DIR;
 Styles = (PACKED);
 End
-#endif
 
 #ifdef WNT
 File gid_File_Lib_LibXMLSec_xmlseccore
@@ -1454,8 +1452,6 @@ File gid_File_Lib_LibXMLSec_xmlsecmscrypto
 Styles = (PACKED);
 End
 #endif
-
-//i20156 - end
 #endif
 
 File gid_File_Lib_Migrationoo2
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index bf17b84..2a89eca 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -92,8 +92,8 @@ SCPDEFS+=-DENABLE_EVOAB2
 SCPDEFS+=-DENABLE_DIRECTX
 .ENDIF
 
-.IF $(ENABLE_NSS_MODULE)==YES
-SCPDEFS+=-DENABLE_NSS_MODULE
+.IF $(ENABLE_XMLSEC)==YES
+SCPDEFS+=-DENABLE_XMLSEC
 .ENDIF
 
 .IF $(GUI)==UNX
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sfx2/source

2011-11-04 Thread Michael Meeks 
 sfx2/source/appl/shutdownicon.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 9b699a2ce1e70f4752de9b9184765f46ffd274f8
Author: Michael Meeks michael.me...@suse.com
Date:   Fri Nov 4 12:34:19 2011 +

WaE: calm down windows shutdownicon warning

diff --git a/sfx2/source/appl/shutdownicon.cxx 
b/sfx2/source/appl/shutdownicon.cxx
index 82c1af7..81b814e 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -116,11 +116,14 @@ SFX_IMPL_ONEINSTANCEFACTORY( ShutdownIcon );
 bool ShutdownIcon::bModalMode = false;
 ShutdownIcon* ShutdownIcon::pShutdownIcon = NULL;
 
+#if !defined( ENABLE_QUICKSTART_APPLET ) || defined( UNX )
 // To remove conditionals
 extern C {
 static void disabled_initSystray() { }
 static void disabled_deInitSystray() { }
 }
+#endif
+
 #define DOSTRING( x )   #x
 #define STRING( x ) DOSTRING( x )
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-11-04 Thread Norbert Thiebaud 
 solenv/gbuild/platform/macosx.mk   |1 +
 solenv/gbuild/platform/winmingw.mk |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 6f9d6b6c518e0c9d98877d71c525c402a12083c9
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Fri Nov 4 08:26:14 2011 -0500

populate gb_CCVER for mac and winmg build

diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 936b27c..055073f 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -48,6 +48,7 @@ endif
 ifneq ($(origin CXX),default)
 gb_CXX := $(CXX)
 endif
+gb_CCVER := $(shell $(gb_CC) -dumpversion | $(gb_AWK) -F. -- '{ print 
$$1*1+$$2*100+$$3 }')
 
 gb_OSDEFS := \
-D$(OS) \
diff --git a/solenv/gbuild/platform/winmingw.mk 
b/solenv/gbuild/platform/winmingw.mk
index 6255974..a6618e3 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@ -39,6 +39,7 @@ gb_AWK := awk
 gb_CLASSPATHSEP := :
 gb_YACC := bison
 gb_RC := $(WINDRES)
+gb_CCVER := $(shell $(gb_CC) -dumpversion | $(gb_AWK) -F. -- '{ print 
$$1*1+$$2*100+$$3 }')
 
 gb_OSDEFS := \
-DWINVER=0x0500 \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - sc/inc sc/source unusedcode.easy

2011-11-04 Thread Markus Mohrhard 
 sc/inc/document.hxx   |4 -
 sc/inc/table.hxx  |3 -
 sc/source/core/data/documen9.cxx  |   65 --
 sc/source/core/data/table1.cxx|9 ---
 sc/source/core/data/table2.cxx|   11 
 sc/source/filter/xml/xmlsubti.cxx |   93 --
 sc/source/filter/xml/xmlsubti.hxx |2 
 unusedcode.easy   |2 
 8 files changed, 42 insertions(+), 147 deletions(-)

New commits:
commit c9c98ab207fba4df35261c66b3753b9ce5e997ba
Author: Laurent Godard oooc...@free.fr
Date:   Fri Nov 4 15:24:53 2011 +0100

calc big doc : ScMyTables::NewSheet method cleaning

diff --git a/sc/source/filter/xml/xmlsubti.cxx 
b/sc/source/filter/xml/xmlsubti.cxx
index 04f9a8e..2bc5b7c 100644
--- a/sc/source/filter/xml/xmlsubti.cxx
+++ b/sc/source/filter/xml/xmlsubti.cxx
@@ -184,17 +184,41 @@ void ScMyTables::NewSheet(const rtl::OUString 
sTableName, const rtl::OUString
 ++nCurrentSheet;
 
 maProtectionData = rProtectData;
+ScDocument *pDoc = ScXMLConverter::GetScDocument(rImport.GetModel());
+
+if (nCurrentSheet  0)
+{
+pDoc-AppendTabOnLoad(sTableName);
+}
+
+rImport.SetTableStyle(sStyleName);
+SetTableStyle(sStyleName);
+}
+
+NewTable(1);
+}
+
+void ScMyTables::SetTableStyle(const rtl::OUString sStyleName)
+{
+//these uno calls are a bit difficult to remove, 
XMLTableStyleContext::FillPropertySet uses
+//SvXMLImportPropertyMapper::FillPropertySet
+if ( sStyleName.getLength() )
+{
+// #i57869# All table style properties for all sheets are now applied 
here,
+// before importing the contents.
+// This is needed for the background color.
+// Sheet visibility has special handling in ScDocFunc::SetTableVisible 
to
+// allow hiding the first sheet.
+// RTL layout is only remembered, not actually applied, so the shapes 
can
+// be loaded before mirroring.
+
 uno::Reference sheet::XSpreadsheetDocument xSpreadDoc( 
rImport.GetModel(), uno::UNO_QUERY );
+
 if ( xSpreadDoc.is() )
 {
 uno::Reference sheet::XSpreadsheets 
xSheets(xSpreadDoc-getSheets());
-if (xSheets.is())
+if ( xSheets.is() )
 {
-if (nCurrentSheet  0)
-{
-ScDocument *pDoc = 
ScXMLConverter::GetScDocument(rImport.GetModel());
-pDoc-AppendTabOnLoad(sTableName);
-}
 uno::Reference container::XIndexAccess xIndex( xSheets, 
uno::UNO_QUERY );
 if ( xIndex.is() )
 {
@@ -202,65 +226,28 @@ void ScMyTables::NewSheet(const rtl::OUString 
sTableName, const rtl::OUString
 if ( xCurrentSheet.is() )
 {
 xCurrentCellRange.set(xCurrentSheet, uno::UNO_QUERY);
-if (!(nCurrentSheet  0))
+uno::Reference beans::XPropertySet 
xProperties(xCurrentSheet, uno::UNO_QUERY);
+if ( xProperties.is() )
 {
-uno::Reference  container::XNamed  
xNamed(xCurrentSheet, uno::UNO_QUERY );
-if ( xNamed.is() )
-try
-{
-xNamed-setName(sTableName);
-}
-catch ( uno::RuntimeException )
-{
-ScDocument *pDoc = 
ScXMLConverter::GetScDocument(rImport.GetModel());
-if (pDoc)
-{
-ScXMLImport::MutexGuard 
aGuard(rImport);
-String 
sTabName(String::CreateFromAscii(Table));
-pDoc-CreateValidTabName(sTabName);
-rtl::OUString sOUTabName(sTabName);
-xNamed-setName(sOUTabName);
-}
-}
-}
-rImport.SetTableStyle(sStyleName);
-
-if ( sStyleName.getLength() )
-{
-// #i57869# All table style properties for all 
sheets are now applied here,
-// before importing the contents.
-// This is needed for the background color.
-// Sheet visibility has special handling in 
ScDocFunc::SetTableVisible to
-// allow hiding the first sheet.
-// RTL layout is only remembered, not actually 
applied, so the shapes can
-// be loaded

[Libreoffice-commits] .: sd/source starmath/source

2011-11-04 Thread Takeshi Abe 
 sd/source/core/drawdoc3.cxx|4 
 sd/source/ui/docshell/docshel3.cxx |4 
 sd/source/ui/docshell/docshell.cxx |5 -
 sd/source/ui/func/fuinsfil.cxx |4 
 sd/source/ui/func/fuprlout.cxx |2 --
 starmath/source/document.cxx   |5 -
 6 files changed, 24 deletions(-)

New commits:
commit 307535d98aeb171ee5e291b77f6c5028b4db936d
Author: Takeshi Abe t...@fixedpoint.jp
Date:   Sat Nov 5 00:04:36 2011 +0900

removed unused macro

diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index 97553d3..06e874d 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -81,10 +81,6 @@
 
 using namespace ::com::sun::star;
 
-#define POOL_BUFFER_SIZE(sal_uInt16)32768
-#define BASIC_BUFFER_SIZE   (sal_uInt16)8192
-#define DOCUMENT_BUFFER_SIZE(sal_uInt16)32768
-
 /*
 |*
 |* Oeffnet ein Bookmark-Dokument
diff --git a/sd/source/ui/docshell/docshel3.cxx 
b/sd/source/ui/docshell/docshel3.cxx
index 75cbaf8..b5ab8da 100644
--- a/sd/source/ui/docshell/docshel3.cxx
+++ b/sd/source/ui/docshell/docshel3.cxx
@@ -72,10 +72,6 @@ using namespace ::com::sun::star::uno;
 
 namespace sd {
 
-#define POOL_BUFFER_SIZE(sal_uInt16)32768
-#define BASIC_BUFFER_SIZE   (sal_uInt16)8192
-#define DOCUMENT_BUFFER_SIZE(sal_uInt16)32768
-
 /*
 |*
 |* SFX-Requests bearbeiten
diff --git a/sd/source/ui/docshell/docshell.cxx 
b/sd/source/ui/docshell/docshell.cxx
index ce1f946..67d526a 100644
--- a/sd/source/ui/docshell/docshell.cxx
+++ b/sd/source/ui/docshell/docshell.cxx
@@ -95,11 +95,6 @@ SFX_IMPL_INTERFACE(DrawDocShell, SfxObjectShell, SdResId(0))
 
 namespace sd {
 
-#define POOL_BUFFER_SIZE(sal_uInt16)32768
-#define BASIC_BUFFER_SIZE   (sal_uInt16)8192
-#define DOCUMENT_BUFFER_SIZE(sal_uInt16)32768
-
-
 GraphicFilter* GetGrfFilter();
 
 /*
diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx
index fed1af0..5a976b8 100644
--- a/sd/source/ui/func/fuinsfil.cxx
+++ b/sd/source/ui/func/fuinsfil.cxx
@@ -85,10 +85,6 @@ namespace sd {
 
 TYPEINIT1( FuInsertFile, FuPoor );
 
-#define POOL_BUFFER_SIZE(sal_uInt16)32768
-#define BASIC_BUFFER_SIZE   (sal_uInt16)8192
-#define DOCUMENT_BUFFER_SIZE(sal_uInt16)32768
-
 /*
 |*
 |* Konstruktor
diff --git a/sd/source/ui/func/fuprlout.cxx b/sd/source/ui/func/fuprlout.cxx
index 35cf5d4..037690d 100644
--- a/sd/source/ui/func/fuprlout.cxx
+++ b/sd/source/ui/func/fuprlout.cxx
@@ -75,8 +75,6 @@ SO2_DECL_REF(SvStorage)
 
 TYPEINIT1( FuPresentationLayout, FuPoor );
 
-#define POOL_BUFFER_SIZE(sal_uInt16)32768
-#define DOCUMENT_BUFFER_SIZE(sal_uInt16)32768
 #define DOCUMENT_TOKEN (sal_Unicode('#'))
 
 /*
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index 5b00574..0ce9275 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -111,11 +111,6 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::ucb;
 using namespace ::com::sun::star::uno;
 
-
-#define DOCUMENT_BUFFER_SIZE(sal_uInt16)32768
-
-static const char pStarMathDoc[] = StarMathDocument;
-
 #define SmDocShell
 #include smslots.hxx
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/new-autofilter-popup' - sc/inc sc/source

2011-11-04 Thread Kohei Yoshida 
 sc/inc/lookupcache.hxx   |2 
 sc/source/core/data/table3.cxx   |   15 --
 sc/source/core/tool/interpr1.cxx |   51 ---
 sc/source/filter/excel/excrecds.cxx  |   20 -
 sc/source/filter/inc/excrecds.hxx|2 
 sc/source/filter/xml/XMLExportDataPilot.cxx  |   10 ++--
 sc/source/filter/xml/XMLExportDatabaseRanges.cxx |4 -
 sc/source/filter/xml/xmlfilti.cxx|6 +-
 sc/source/ui/dbgui/filtdlg.cxx   |   20 -
 sc/source/ui/dbgui/pfiltdlg.cxx  |   12 ++---
 sc/source/ui/view/gridwin.cxx|   20 -
 11 files changed, 87 insertions(+), 75 deletions(-)

New commits:
commit de9f1649fc5b7b2c8d662f082c1c3c514f55d5fe
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Fri Nov 4 12:18:47 2011 -0400

More on avoiding direct access to pStr, also fixed several memory leaks.

diff --git a/sc/inc/lookupcache.hxx b/sc/inc/lookupcache.hxx
index 01ab425..cdf3b42 100644
--- a/sc/inc/lookupcache.hxx
+++ b/sc/inc/lookupcache.hxx
@@ -110,7 +110,7 @@ public:
 DBG_ERRORFILE( ScLookupCache::QueryCriteria not prepared 
for this ScQueryOp);
 }
 if (rEntry.bQueryByString)
-setString( rEntry.pStr);
+setString(rEntry.GetQueryString());
 else
 setDouble( rEntry.nVal);
 }
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 8f3c985..ec9657f 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -1274,12 +1274,13 @@ bool ScTable::ValidQuery(SCROW nRow, const 
ScQueryParam rParam,
 }
 if ( !bRealRegExp )
 {
+rtl::OUString aQueryStr = rEntry.GetQueryString();
 if ( rEntry.eOp == SC_EQUAL || rEntry.eOp == SC_NOT_EQUAL
 || rEntry.eOp == SC_CONTAINS || rEntry.eOp == 
SC_DOES_NOT_CONTAIN
 || rEntry.eOp == SC_BEGINS_WITH || rEntry.eOp == 
SC_ENDS_WITH
 || rEntry.eOp == SC_DOES_NOT_BEGIN_WITH || rEntry.eOp == 
SC_DOES_NOT_END_WITH )
 {
-if ( !rEntry.bQueryByString  rEntry.pStr-Len() == 0 )
+if (!rEntry.bQueryByString  aQueryStr.isEmpty())
 {
 // #i18374# When used from functions (match, countif, 
sumif, vlookup, hlookup, lookup),
 // the query value is assigned directly, and the 
string is empty. In that case,
@@ -1290,7 +1291,7 @@ bool ScTable::ValidQuery(SCROW nRow, const ScQueryParam 
rParam,
 }
 else if ( bMatchWholeCell )
 {
-bOk = pTransliteration-isEqual( aCellStr, 
*rEntry.pStr );
+bOk = pTransliteration-isEqual(aCellStr, aQueryStr);
 if ( rEntry.eOp == SC_NOT_EQUAL )
 bOk = !bOk;
 }
@@ -1300,7 +1301,7 @@ bool ScTable::ValidQuery(SCROW nRow, const ScQueryParam 
rParam,
 aCellStr, ScGlobal::eLnge, 0, aCellStr.Len(),
 NULL ) );
 String aQuer( pTransliteration-transliterate(
-*rEntry.pStr, ScGlobal::eLnge, 0, 
rEntry.pStr-Len(),
+aQueryStr, ScGlobal::eLnge, 0, 
aQueryStr.getLength(),
 NULL ) );
 xub_StrLen nIndex = (rEntry.eOp == SC_ENDS_WITH
 || rEntry.eOp == SC_DOES_NOT_END_WITH)? 
(aCell.Len()-aQuer.Len()):0;
@@ -1337,7 +1338,7 @@ bool ScTable::ValidQuery(SCROW nRow, const ScQueryParam 
rParam,
 else
 {   // use collator here because data was probably sorted
 sal_Int32 nCompare = pCollator-compareString(
-aCellStr, *rEntry.pStr );
+aCellStr, aQueryStr);
 switch (rEntry.eOp)
 {
 case SC_LESS :
@@ -1559,7 +1560,7 @@ static void lcl_PrepareQuery( ScDocument* pDoc, ScTable* 
pTab, ScQueryParam rPa
 {
 sal_uInt32 nIndex = 0;
 rEntry.bQueryByString = !( pDoc-GetFormatTable()-
-IsNumberFormat( *rEntry.pStr, nIndex, rEntry.nVal ) );
+IsNumberFormat(rEntry.GetQueryString(), nIndex, 
rEntry.nVal));
 if (rEntry.bQueryByDate)
 {
 if (!rEntry.bQueryByString  ((nIndex % 
SV_COUNTRY_LANGUAGE_OFFSET) != 0))
@@ -1903,7 +1904,9 @@ bool ScTable::CreateStarQuery(SCCOL nCol1, SCROW nRow1, 
SCCOL nCol2, SCROW nRow2
 // Vierte Spalte Wert
 if (bValid)
 {
-GetString(nCol1 + 3, nRow, *rEntry.pStr);
+String aStr;

[Libreoffice-commits] Changes to 'feature/fpicker-rework'

2011-11-04 Thread Michael Meeks 
New branch 'feature/fpicker-rework' available with the following commits:
commit 7963ee1d721864032d0c70b07cd824c593eca9f4
Author: Michael Meeks michael.me...@suse.com
Date:   Fri Nov 4 14:40:18 2011 +

gtk: move the file-picker into vcl/ and add Application:: factory hooks

drop un-necessary uno service related fluff, and component instantiation.
nominal move to XMultiComponentFactory from XMultiServiceFactory
Include fpicker in compilation for gtk3, but more work required here
Simplify setting up transient parents for picker dialogs

commit d1fd969050793ab48961ce2ceb13dc9c0920501b
Author: Michael Meeks michael.me...@suse.com
Date:   Fri Nov 4 13:13:04 2011 +

gtk: use a more sensibly unique version define

___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basic/source sd/source svx/source sw/source

2011-11-04 Thread Ivan Timofeev 
 basic/source/comp/exprtree.cxx |8 +++-
 sd/source/ui/view/sdview2.cxx  |2 +-
 svx/source/svdraw/svdpage.cxx  |   10 +-
 sw/source/ui/dbui/dbmgr.cxx|4 +++-
 4 files changed, 16 insertions(+), 8 deletions(-)

New commits:
commit 9b94d385f94562049bf93f2fc0dd0558d6a56dd1
Author: Ivan Timofeev timofeev@gmail.com
Date:   Fri Nov 4 23:01:17 2011 +0400

cppcheck: avoid possible null pointer dereferences

diff --git a/basic/source/comp/exprtree.cxx b/basic/source/comp/exprtree.cxx
index 1c7ec1b..41caa05 100644
--- a/basic/source/comp/exprtree.cxx
+++ b/basic/source/comp/exprtree.cxx
@@ -983,8 +983,14 @@ SbiExpression* SbiExprList::Get( short n )
 
 void SbiExprList::addExpression( SbiExpression* pExpr )
 {
+if( !pFirst )
+{
+pFirst = pExpr;
+return;
+}
+
 SbiExpression* p = pFirst;
-while( p  p-pNext )
+while( p-pNext )
 p = p-pNext;
 
 p-pNext = pExpr;
diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx
index 68e9a1f..b1a87b1 100644
--- a/sd/source/ui/view/sdview2.cxx
+++ b/sd/source/ui/view/sdview2.cxx
@@ -466,10 +466,10 @@ void View::DragFinished( sal_Int8 nDropAction )
 nm--;
 SdrMark* pM=mpDragSrcMarkList-GetMark(nm);
 SdrObject* pObj=pM-GetMarkedSdrObj();
-sal_uInt32 nOrdNum=pObj-GetOrdNumDirect();
 
 if( pObj  pObj-GetPage() )
 {
+sal_uInt32 nOrdNum=pObj-GetOrdNumDirect();
 #ifdef DBG_UTIL
 SdrObject* pChkObj =
 #endif
diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx
index 77f739b..63fe525 100644
--- a/svx/source/svdraw/svdpage.cxx
+++ b/svx/source/svdraw/svdpage.cxx
@@ -152,10 +152,10 @@ void SdrObjList::CopyObjects(const SdrObjList rSrcList)
 SdrObject* pSO=rSrcList.GetObj(no);
 
 SdrObject* pDO = pSO-Clone();
-pDO-SetModel(pModel);
-pDO-SetPage(pPage);
 
 if (pDO!=NULL) {
+pDO-SetModel(pModel);
+pDO-SetPage(pPage);
 NbcInsertObject(pDO,CONTAINER_APPEND,aReason);
 } else {
 nCloneErrCnt++;
@@ -425,11 +425,11 @@ SdrObject* SdrObjList::NbcRemoveObject(sal_uIntPtr 
nObjNum)
 SdrObject* pObj=maList[nObjNum];
 RemoveObjectFromContainer(nObjNum);
 
-// flushViewObjectContacts() clears the VOC's and those invalidate
-pObj-GetViewContact().flushViewObjectContacts(true);
-
 DBG_ASSERT(pObj!=NULL,Object zum Removen nicht gefunden);
 if (pObj!=NULL) {
+// flushViewObjectContacts() clears the VOC's and those invalidate
+pObj-GetViewContact().flushViewObjectContacts(true);
+
 DBG_ASSERT(pObj-IsInserted(),ZObjekt hat keinen Inserted-Status);
 pObj-SetInserted(sal_False); // Ruft u.a. den UserCall
 pObj-SetObjList(NULL);
diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx
index a732303..cd0baba 100644
--- a/sw/source/ui/dbui/dbmgr.cxx
+++ b/sw/source/ui/dbui/dbmgr.cxx
@@ -1779,6 +1779,8 @@ sal_Bool SwNewDBMgr::GetColumnCnt(const String 
rSourceName, const String rTabl
 aData.nCommandType = -1;
 pFound = FindDSData(aData, sal_False);
 }
+if (!pFound)
+return sal_False;
 //check validity of supplied record Id
 if(pFound-aSelection.getLength())
 {
@@ -1795,7 +1797,7 @@ sal_Bool SwNewDBMgr::GetColumnCnt(const String 
rSourceName, const String rTabl
 if(!bFound)
 return sal_False;
 }
-if(pFound  pFound-xResultSet.is()  !pFound-bAfterSelection)
+if(pFound-xResultSet.is()  !pFound-bAfterSelection)
 {
 sal_Int32 nOldRow = 0;
 try
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/new-autofilter-popup' - 5 commits - sc/inc sc/source

2011-11-04 Thread Kohei Yoshida 
 sc/inc/queryparam.hxx  |3 -
 sc/source/core/data/table3.cxx |   83 +
 sc/source/core/tool/queryparam.cxx |   12 -
 3 files changed, 70 insertions(+), 28 deletions(-)

New commits:
commit 3ebf6c52dc469c199f090ac5190abebdc2934fad
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Fri Nov 4 16:13:17 2011 -0400

Do the simple string equality matching in ScQueryEntry instead.

diff --git a/sc/inc/queryparam.hxx b/sc/inc/queryparam.hxx
index 79330ae..f3d755c 100644
--- a/sc/inc/queryparam.hxx
+++ b/sc/inc/queryparam.hxx
@@ -72,7 +72,8 @@ public:
 // creates pSearchParam and pSearchText if necessary, always RegExp!
 utl::TextSearch* GetSearchTextPtr( bool bCaseSens ) const;
 
-boolMatchByString(const rtl::OUString rStr) const;
+boolIsQueryStringEmpty() const;
+boolMatchByString(const rtl::OUString rStr, bool bCaseSens) 
const;
 SC_DLLPUBLIC void SetQueryString(const rtl::OUString rStr);
 SC_DLLPUBLIC rtl::OUString GetQueryString() const;
 voidClear();
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 4f0b540..7cae817 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -1077,7 +1077,7 @@ bool isQueryByValue(const ScTable rTable, const 
ScQueryEntry rEntry, SCROW nRo
 return rTable.HasValueData(static_castSCCOL(rEntry.nField), nRow);
 }
 
-bool isTextMatchOnlyOp(const ScQueryEntry rEntry)
+bool isPartialTextMatchOp(const ScQueryEntry rEntry)
 {
 switch (rEntry.eOp)
 {
@@ -1097,7 +1097,7 @@ bool isTextMatchOnlyOp(const ScQueryEntry rEntry)
 
 bool isTextMatchOp(const ScQueryEntry rEntry)
 {
-if (isTextMatchOnlyOp(rEntry))
+if (isPartialTextMatchOp(rEntry))
 return true;
 
 switch (rEntry.eOp)
@@ -1266,7 +1266,8 @@ bool ScTable::ValidQuery(SCROW nRow, const ScQueryParam 
rParam,
 else if (isQueryByString(*this, rEntry, nRow, pCell))
 {
 String  aCellStr;
-if (isTextMatchOnlyOp(rEntry))
+if (isPartialTextMatchOp(rEntry))
+// may have to do partial textural comparison.
 bMatchWholeCell = false;
 
 if ( pCell )
@@ -1338,11 +1339,10 @@ bool ScTable::ValidQuery(SCROW nRow, const 
ScQueryParam rParam,
 }
 if ( !bRealRegExp )
 {
-// Simple string matching.
-rtl::OUString aQueryStr = rEntry.GetQueryString();
+// Simple string matching i.e. no regexp match.
 if (isTextMatchOp(rEntry))
 {
-if (!rEntry.bQueryByString  aQueryStr.isEmpty())
+if (!rEntry.bQueryByString  rEntry.IsQueryStringEmpty())
 {
 // #i18374# When used from functions (match, countif, 
sumif, vlookup, hlookup, lookup),
 // the query value is assigned directly, and the 
string is empty. In that case,
@@ -1353,12 +1353,13 @@ bool ScTable::ValidQuery(SCROW nRow, const 
ScQueryParam rParam,
 }
 else if ( bMatchWholeCell )
 {
-bOk = pTransliteration-isEqual(aCellStr, aQueryStr);
+bOk = rEntry.MatchByString(aCellStr, rParam.bCaseSens);
 if ( rEntry.eOp == SC_NOT_EQUAL )
 bOk = !bOk;
 }
 else
 {
+rtl::OUString aQueryStr = rEntry.GetQueryString();
 String aCell( pTransliteration-transliterate(
 aCellStr, ScGlobal::eLnge, 0, aCellStr.Len(),
 NULL ) );
@@ -1400,7 +1401,7 @@ bool ScTable::ValidQuery(SCROW nRow, const ScQueryParam 
rParam,
 else
 {   // use collator here because data was probably sorted
 sal_Int32 nCompare = pCollator-compareString(
-aCellStr, aQueryStr);
+aCellStr, rEntry.GetQueryString());
 switch (rEntry.eOp)
 {
 case SC_LESS :
diff --git a/sc/source/core/tool/queryparam.cxx 
b/sc/source/core/tool/queryparam.cxx
index bfb31d2..ca7d3a2 100644
--- a/sc/source/core/tool/queryparam.cxx
+++ b/sc/source/core/tool/queryparam.cxx
@@ -33,6 +33,7 @@
 
 #include queryparam.hxx
 #include unotools/textsearch.hxx
+#include unotools/transliterationwrapper.hxx
 
 using ::std::vector;
 
@@ -96,9 +97,16 @@ ScQueryEntry ScQueryEntry::operator=( const ScQueryEntry r 
)
 return *this;
 }
 
-bool ScQueryEntry::MatchByString(const rtl::OUString rStr) const
+bool ScQueryEntry::IsQueryStringEmpty() const
 {
-return rStr.equals(*pStr);
+return pStr-Len() == 0;
+}
+
+bool ScQueryEntry::MatchByString(const rtl::OUString rStr, bool

[Libreoffice-commits] .: scripting/source

2011-11-04 Thread Miklos Vajna 
 scripting/source/pyprov/msgbox.py |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 974c15923465ebb2cc5c9c99180737298ed69c95
Author: Laurent Godard oooc...@free.fr
Date:   Fri Nov 4 15:02:34 2011 +0100

a very minor typo in a comment

diff --git a/scripting/source/pyprov/msgbox.py 
b/scripting/source/pyprov/msgbox.py
index c9ee80b..b276d76 100644
--- a/scripting/source/pyprov/msgbox.py
+++ b/scripting/source/pyprov/msgbox.py
@@ -96,7 +96,7 @@ class MsgBox(unohelper.Base):
 self.ButtonSize = size
 self.ButtonSpace = self.ButtonSize/2
 else:
-# boxsize i calculated form buttonsize
+# boxsize is calculated from buttonsize
 self.boxSize = numberOfButtons * (self.ButtonSize +
 self.ButtonSpace) + 
self.ButtonSpace
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/fpicker-rework' - 4 commits - cui/source .gitignore sfx2/inc sfx2/source vcl/AllLangResTarget_vcl.mk vcl/inc vcl/source vcl/unx

2011-11-04 Thread Michael Meeks 
 .gitignore |   17 ++
 cui/source/options/optgdlg.cxx |   25 +---
 sfx2/inc/sfx2/filedlghelper.hxx|1 
 sfx2/source/dialog/filedlghelper.cxx   |   10 -
 vcl/AllLangResTarget_vcl.mk|1 
 vcl/inc/salinst.hxx|2 
 vcl/inc/svids.hrc  |   19 +++
 vcl/inc/unx/gtk/gtkinst.hxx|2 
 vcl/inc/vcl/svapp.hxx  |4 
 vcl/source/app/svapp.cxx   |6 +
 vcl/source/src/fpicker.src |   92 
 vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx   |   78 +++--
 vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx   |1 
 vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx |   15 --
 vcl/unx/gtk/fpicker/SalGtkPicker.cxx   |8 -
 vcl/unx/gtk/fpicker/resourceprovider.cxx   |  165 ++---
 16 files changed, 238 insertions(+), 208 deletions(-)

New commits:
commit 5e5ef2f7578808250c0dcf180de4b8ef95bb0c8e
Author: Michael Meeks michael.me...@suse.com
Date:   Fri Nov 4 22:32:52 2011 +

gtk3: port file-picker, using more standard combobox APIs etc.

diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx 
b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
index 7ffcb69..fb88175 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
@@ -59,8 +59,6 @@
 #include gtk/fpicker/resourceprovider.hxx
 #include gtk/fpicker/SalGtkFilePicker.hxx
 
-#if !GTK_CHECK_VERSION(3,0,0)
-
 //
 // namespace directives
 //
@@ -211,7 +209,14 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference 
uno::XComponentContext
 
 m_pAligns[i] = gtk_alignment_new(0, 0, 0, 1);
 
-m_pLists[i] = gtk_combo_box_new_text();
+m_pListStores[i] = gtk_list_store_new (1, G_TYPE_STRING);
+m_pLists[i] = 
gtk_combo_box_new_with_model(GTK_TREE_MODEL(m_pListStores[i]));
+g_object_unref (m_pListStores[i]); // owned by the widget.
+GtkCellRenderer *pCell = gtk_cell_renderer_text_new ();
+gtk_cell_layout_pack_start(
+GTK_CELL_LAYOUT(m_pLists[i]), pCell, TRUE);
+gtk_cell_layout_set_attributes(
+GTK_CELL_LAYOUT (m_pLists[i]), pCell, text, 0, NULL);
 
 m_pListLabels[i] = gtk_label_new(  );
 
@@ -497,8 +502,16 @@ dialog_remove_buttons( GtkDialog *pDialog )
 {
 g_return_if_fail( GTK_IS_DIALOG( pDialog ) );
 
+GtkWidget *pActionArea;
+
+#if GTK_CHECK_VERSION(3,0,0)
+pActionArea = gtk_dialog_get_action_area( pDialog );
+#else
+pActionArea = pDialog-action_area;
+#endif
+
 GList *pChildren =
-gtk_container_get_children( GTK_CONTAINER( pDialog-action_area ) );
+gtk_container_get_children( GTK_CONTAINER( pActionArea ) );
 
 for( GList *p = pChildren; p; p = p-next )
 gtk_widget_destroy( GTK_WIDGET( p-data ) );
@@ -1136,14 +1149,20 @@ GtkWidget *SalGtkFilePicker::getWidget( sal_Int16 
nControlId, GType *pType )
 
//
 // XFilePickerControlAccess functions
 
//
-namespace
+static void HackWidthToFirst(GtkComboBox *pWidget)
 {
-void HackWidthToFirst(GtkComboBox *pWidget)
-{
-GtkRequisition requisition;
-gtk_widget_size_request(GTK_WIDGET(pWidget), requisition);
-gtk_widget_set_size_request(GTK_WIDGET(pWidget), requisition.width, 
-1);
-}
+GtkRequisition requisition;
+gtk_widget_size_request(GTK_WIDGET(pWidget), requisition);
+gtk_widget_set_size_request(GTK_WIDGET(pWidget), requisition.width, -1);
+}
+
+static void ComboBoxAppendText(GtkComboBox *pCombo, const rtl::OUString rStr)
+{
+  GtkTreeIter aIter;
+  GtkListStore *pStore = GTK_LIST_STORE(gtk_combo_box_get_model(pCombo));
+  rtl::OString aStr = rtl::OUStringToOString(rStr, RTL_TEXTENCODING_UTF8);
+  gtk_list_store_append(pStore, aIter);
+  gtk_list_store_set(pStore, aIter, 0, aStr.getStr(), -1);
 }
 
 void SalGtkFilePicker::HandleSetListValue(GtkComboBox *pWidget, sal_Int16 
nControlAction, const uno::Any rValue)
@@ -1154,7 +1173,7 @@ void SalGtkFilePicker::HandleSetListValue(GtkComboBox 
*pWidget, sal_Int16 nContr
 {
 OUString sItem;
 rValue = sItem;
-gtk_combo_box_append_text(pWidget, 
rtl::OUStringToOString(sItem, RTL_TEXTENCODING_UTF8).getStr());
+ComboBoxAppendText(pWidget, sItem);
 if (!bVersionWidthUnset)
 {
 HackWidthToFirst(pWidget);
@@ -1169,8 +1188,7 @@ void SalGtkFilePicker::HandleSetListValue(GtkComboBox 
*pWidget, sal_Int16 nContr
 sal_Int32 nItemCount = aStringList.getLength();
 for (sal_Int32 i =

[Libreoffice-commits] .: 4 commits - reportbuilder/util scripting/source solenv/gbuild swext/Extension_wiki-publisher.mk

2011-11-04 Thread Michael Stahl 
 reportbuilder/util/description-en-US.txt  |2 -
 scripting/source/pyprov/description-en-US.txt |1 
 solenv/gbuild/AllLangResTarget.mk |5 +-
 solenv/gbuild/Configuration.mk|2 -
 solenv/gbuild/Extension.mk|   46 +++---
 solenv/gbuild/SdiTarget.mk|3 +
 solenv/gbuild/gbuild.mk   |2 -
 solenv/gbuild/platform/android.mk |3 -
 solenv/gbuild/platform/ios.mk |   16 -
 solenv/gbuild/platform/macosx.mk  |   16 -
 solenv/gbuild/platform/solaris.mk |   16 -
 solenv/gbuild/platform/unxgcc.mk  |   16 -
 solenv/gbuild/platform/windows.mk |   18 --
 solenv/gbuild/platform/winmingw.mk|   15 
 swext/Extension_wiki-publisher.mk |1 
 15 files changed, 49 insertions(+), 113 deletions(-)

New commits:
commit 3fc888c2c518631d80d46e1d260378f810b3d7fe
Author: Michael Stahl mst...@redhat.com
Date:   Fri Nov 4 23:14:46 2011 +0100

gbuild: clean up pointless proliferation of PRECOMMANDs, all alike

diff --git a/solenv/gbuild/AllLangResTarget.mk 
b/solenv/gbuild/AllLangResTarget.mk
index 5e0f89a..ba714df 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -48,9 +48,8 @@
 # SrsPartMergeTarget class
 
 gb_SrsPartMergeTarget_TRANSEXTARGET := $(call 
gb_Executable_get_target_for_build,transex3)
-# gb_SrsPartMergeTarget_TRANSEXPRECOMMAND is set by the platforms
-
-gb_SrsPartMergeTarget_TRANSEXCOMMAND := 
$(gb_SrsPartMergeTarget_TRANSEXPRECOMMAND) 
$(gb_SrsPartMergeTarget_TRANSEXTARGET)
+gb_SrsPartMergeTarget_TRANSEXCOMMAND := \
+   $(gb_Helper_set_ld_path) $(gb_SrsPartMergeTarget_TRANSEXTARGET)
 gb_SrsPartMergeTarget_SDFLOCATION := $(SRCDIR)/translations/$(INPATH)/misc/sdf/
 
 define gb_SrsPartMergeTarget__command
diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk
index 21497f5..c08719d 100644
--- a/solenv/gbuild/Configuration.mk
+++ b/solenv/gbuild/Configuration.mk
@@ -223,7 +223,7 @@ $(call gb_XcuLangpackTarget_get_outdir_target,%) :
 
 gb_XcuMergeTarget_CFGEXTARGET := $(call gb_Executable_get_target,cfgex)
 gb_XcuMergeTarget_CFGEXCOMMAND := \
-   $(gb_CFGEXPRECOMMAND) $(gb_XcuMergeTarget_CFGEXTARGET)
+   $(gb_Helper_set_ld_path) $(gb_XcuMergeTarget_CFGEXTARGET)
 gb_XcuMergeTarget_SDFLOCATION := $(SRCDIR)/translations/$(INPATH)/misc/sdf/
 
 # PRJNAME is computed from the stem (parameter $(2))
diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index aecae5e..5b9267f 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -35,7 +35,7 @@ gb_Extension_LICENSEFILE := LICENSE
 endif
 gb_Extension_XRMEXTARGET := $(call gb_Executable_get_target,xrmex)
 gb_Extension_XRMEXCOMMAND := \
-   $(gb_XRMEXPRECOMMAND) $(gb_Extension_XRMEXTARGET)
+   $(gb_Helper_set_ld_path) $(gb_Extension_XRMEXTARGET)
 gb_Extension_SDFLOCATION := $(SRCDIR)/translations/$(INPATH)/misc/sdf/
 # does not contain en-US because it is special cased in gb_Extension_Extension
 gb_Extension_LANGS := $(filter-out en-US,$(gb_WITH_LANG))
diff --git a/solenv/gbuild/SdiTarget.mk b/solenv/gbuild/SdiTarget.mk
index f8d7b4c..d1fa175 100644
--- a/solenv/gbuild/SdiTarget.mk
+++ b/solenv/gbuild/SdiTarget.mk
@@ -33,7 +33,8 @@
 # SdiTarget class
 
 gb_SdiTarget_SVIDLTARGET := $(call gb_Executable_get_target_for_build,svidl)
-gb_SdiTarget_SVIDLCOMMAND := $(gb_SdiTarget_SVIDLPRECOMMAND) 
$(gb_SdiTarget_SVIDLTARGET)
+gb_SdiTarget_SVIDLCOMMAND := \
+   $(gb_Helper_set_ld_path) $(gb_SdiTarget_SVIDLTARGET)
 
 $(call gb_SdiTarget_get_target,%) : $(SRCDIR)/%.sdi | 
$(gb_SdiTarget_SVIDLTARGET)
$(call gb_Output_announce,$*,$(true),SDI,1)
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 4be10a4..9a47723 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -352,7 +352,7 @@ gb_XSLTPROCTARGET :=
 gb_XSLTPROC := xsltproc
 else
 gb_XSLTPROCTARGET := $(call gb_Executable_get_target_for_build,xsltproc)
-gb_XSLTPROC := $(gb_XSLTPROCPRECOMMAND) $(gb_XSLTPROCTARGET)
+gb_XSLTPROC := $(gb_Helper_set_ld_path) $(gb_XSLTPROCTARGET)
 endif
 
 ifeq ($(SYSTEM_PYTHON),YES)
diff --git a/solenv/gbuild/platform/android.mk 
b/solenv/gbuild/platform/android.mk
index 8bf5acc..03f85ec 100644
--- a/solenv/gbuild/platform/android.mk
+++ b/solenv/gbuild/platform/android.mk
@@ -60,10 +60,4 @@ gb_UnoApiTarget_CPPUMAKERCOMMAND := $(gb_Helper_set_ld_path) 
SOLARBINDIR=$(OUTDI
 gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR_FOR_BUILD)/bin/regview
 gb_UnoApiTarget_REGVIEWCOMMAND := $(gb_Helper_set_ld_path) 
SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
 
-# Configuration
-gb_CFGEXPRECOMMAND := $(gb_Helper_set_ld_path)
-
-# Extension
-gb_XRMEXPRECOMMAND := $(gb_Helper_set_ld_path)
-
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/ios.mk

[Libreoffice-commits] .: Branch 'feature/new-autofilter-popup' - 2 commits - sc/inc sc/source

2011-11-04 Thread Kohei Yoshida 
 sc/inc/queryparam.hxx  |9 +++-
 sc/source/core/data/table3.cxx |2 +
 sc/source/core/tool/queryparam.cxx |   70 +
 sc/source/ui/inc/gridwin.hxx   |7 ++-
 sc/source/ui/view/gridwin.cxx  |2 +
 sc/source/ui/view/gridwin2.cxx |4 ++
 sc/source/ui/view/tabview.cxx  |4 ++
 7 files changed, 78 insertions(+), 20 deletions(-)

New commits:
commit be16da1407b237b18accc39f566b8a8509d66bf0
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Fri Nov 4 22:36:32 2011 -0400

Temporarily disabling the new autofilter popup due to a set-back.

Ugh!  I need to refactor the query validation code first before working
on the new popup.  I will

1) temporarily disable the new autofilter popup,
2) merge my changes so far to master, and
3) work on refactoring the query validation code without changing the
   current functionality, then come back to working on the new popup.

Darn...

diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx
index 00827d9..4271df2 100644
--- a/sc/source/ui/inc/gridwin.hxx
+++ b/sc/source/ui/inc/gridwin.hxx
@@ -42,6 +42,8 @@
 #include memory
 #include boost/scoped_ptr.hpp
 
+#define USE_NEW_AUTOFILTER 0
+
 // ---
 
 struct ScTableInfo;
@@ -341,8 +343,10 @@ public:
 
 voidLaunchDataSelectMenu( SCCOL nCol, SCROW nRow, bool 
bDataSelect );
 voidDoScenarioMenue( const ScRange rScenRange );
-
+#if USE_NEW_AUTOFILTER
 voidLaunchAutoFilterMenu(SCCOL nCol, SCROW nRow);
+voidUpdateAutoFilterFromMenu();
+#endif
 voidLaunchPageFieldMenu( SCCOL nCol, SCROW nRow );
 voidLaunchDPFieldMenu( SCCOL nCol, SCROW nRow );
 
@@ -379,7 +383,6 @@ public:
 
 voidCheckNeedsRepaint();
 
-voidUpdateAutoFilterFromMenu();
 voidUpdateDPFromFieldPopupMenu();
 voidUpdateVisibleRange();
 
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index dc7ff54..8293b6f 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -585,6 +585,7 @@ void ScGridWindow::ExecPageFieldSelect( SCCOL nCol, SCROW 
nRow, sal_Bool bHasSel
 }
 }
 
+#if USE_NEW_AUTOFILTER
 namespace {
 
 class PopupAction : public ScMenuFloatingWindow::Action
@@ -700,6 +701,7 @@ void ScGridWindow::UpdateAutoFilterFromMenu()
 pViewData-GetView()-Query(aParam, NULL, true);
 pDBData-SetQueryParam(aParam);
 }
+#endif
 
 void ScGridWindow::LaunchPageFieldMenu( SCCOL nCol, SCROW nRow )
 {
diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx
index 2688e04..a3ecaae 100644
--- a/sc/source/ui/view/gridwin2.cxx
+++ b/sc/source/ui/view/gridwin2.cxx
@@ -165,7 +165,11 @@ bool ScGridWindow::DoAutoFilterButton( SCCOL nCol, SCROW 
nRow, const MouseEvent
 HideCursor();
 mpFilterButton-draw();
 ShowCursor();
+#if USE_NEW_AUTOFILTER
 LaunchAutoFilterMenu(nCol, nRow);
+#else
+LaunchDataSelectMenu(nCol, nRow, false);
+#endif
 return true;
 }
 
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index 6e6863a..6804c36 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -2403,10 +2403,14 @@ void ScTabView::StartDataSelect()
 aViewData.GetDocument()-GetAttr(
 nCol, nRow, aViewData.GetTabNo(), ATTR_MERGE_FLAG));
 
+#if USE_NEW_AUTOFILTER
 if (pAttr-HasAutoFilter())
 pWin-LaunchAutoFilterMenu(nCol, nRow);
 else
 pWin-LaunchDataSelectMenu(nCol, nRow, true);
+#else
+pWin-LaunchDataSelectMenu(nCol, nRow, !pAttr-HasAutoFilter());
+#endif
 }
 
 void ScTabView::EnableRefInput(bool bFlag)
commit 7c387721b5de40d5a58189a9f05ebdcbea28d395
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Fri Nov 4 21:25:49 2011 -0400

Hide the query strings member, and add relevant methods for it.

diff --git a/sc/inc/queryparam.hxx b/sc/inc/queryparam.hxx
index f3d755c..6b87397 100644
--- a/sc/inc/queryparam.hxx
+++ b/sc/inc/queryparam.hxx
@@ -52,9 +52,8 @@ namespace utl {
 
 struct ScQueryEntry
 {
-private:
-String* pStr;
-public:
+typedef std::vectorrtl::OUString QueryStringsType;
+
 boolbDoQuery;
 boolbQueryByString;
 boolbQueryByDate;
@@ -74,11 +73,15 @@ public:
 
 boolIsQueryStringEmpty() const;
 boolMatchByString(const rtl::OUString rStr, bool bCaseSens) 
const;
+voidSwapQueryStrings(QueryStringsType rStrings);
+voidSortQueryStrings(bool bCaseSens);
 SC_DLLPUBLIC void SetQueryString(const rtl::OUString rStr);
 SC_DLLPUBLIC rtl::OUString GetQueryString() const;
 voidClear();
 ScQueryEntry   operator=( const ScQueryEntry r );
 bool

[Libreoffice-commits] .: Branch 'feature/new-autofilter-popup' - 0 commits -

2011-11-04 Thread Kohei Yoshida 
Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 3 commits - sc/inc sc/Library_sc.mk sc/qa sc/source

2011-11-04 Thread Kohei Yoshida 
 sc/Library_sc.mk |1 
 sc/inc/lookupcache.hxx   |   43 
 sc/inc/queryentry.hxx|   78 
 sc/inc/queryparam.hxx|   48 -
 sc/qa/unit/ucalc.cxx |1 
 sc/source/core/data/dociter.cxx  |1 
 sc/source/core/data/documen3.cxx |1 
 sc/source/core/data/dpcachetable.cxx |1 
 sc/source/core/data/dpobject.cxx |2 
 sc/source/core/data/dpshttab.cxx |1 
 sc/source/core/data/dptablecache.cxx |1 
 sc/source/core/data/table2.cxx   |1 
 sc/source/core/data/table3.cxx   |1 
 sc/source/core/inc/interpre.hxx  |   31 ---
 sc/source/core/tool/dbdata.cxx   |1 
 sc/source/core/tool/doubleref.cxx|1 
 sc/source/core/tool/interpr1.cxx |   31 +++
 sc/source/core/tool/lookupcache.cxx  |   43 
 sc/source/core/tool/queryentry.cxx   |  191 
 sc/source/core/tool/queryparam.cxx   |  212 ++-
 sc/source/filter/excel/excimp8.cxx   |1 
 sc/source/filter/excel/excrecds.cxx  |1 
 sc/source/filter/xml/XMLExportDataPilot.cxx  |1 
 sc/source/filter/xml/XMLExportDatabaseRanges.cxx |1 
 sc/source/filter/xml/xmldrani.cxx|1 
 sc/source/filter/xml/xmlfilti.cxx|1 
 sc/source/ui/dbgui/filtdlg.cxx   |1 
 sc/source/ui/dbgui/pfiltdlg.cxx  |1 
 sc/source/ui/docshell/dbdocfun.cxx   |1 
 sc/source/ui/unoobj/cellsuno.cxx |1 
 sc/source/ui/unoobj/datauno.cxx  |2 
 sc/source/ui/vba/vbarange.cxx|1 
 sc/source/ui/view/cellsh2.cxx|2 
 sc/source/ui/view/dbfunc.cxx |1 
 sc/source/ui/view/dbfunc3.cxx|1 
 sc/source/ui/view/gridwin.cxx|1 
 sc/source/ui/view/gridwin4.cxx   |1 
 37 files changed, 412 insertions(+), 297 deletions(-)

New commits:
commit 9c8670847f0945c05c8f40e83f0d845c0d3cff6b
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Sat Nov 5 01:05:29 2011 -0400

Removed queryentry.hxx include from lookupcache.hxx header.

For better encapsulation of ScQueryEntry.

diff --git a/sc/inc/lookupcache.hxx b/sc/inc/lookupcache.hxx
index 49b5def..d70b1b5 100644
--- a/sc/inc/lookupcache.hxx
+++ b/sc/inc/lookupcache.hxx
@@ -32,7 +32,6 @@
 #include address.hxx
 #include global.hxx
 #include queryparam.hxx
-#include queryentry.hxx
 #include formula/token.hxx
 #include svl/listener.hxx
 #include tools/string.hxx
@@ -91,45 +90,9 @@ public:
 
 public:
 
-explicit QueryCriteria( const ScQueryEntry  rEntry ) :
-mfVal(0.0), mbAlloc(false), mbString(false)
-{
-switch (rEntry.eOp)
-{
-case SC_EQUAL :
-meOp = EQUAL;
-break;
-case SC_LESS_EQUAL :
-meOp = LESS_EQUAL;
-break;
-case SC_GREATER_EQUAL :
-meOp = GREATER_EQUAL;
-break;
-default:
-meOp = UNKNOWN;
-DBG_ERRORFILE( ScLookupCache::QueryCriteria not prepared 
for this ScQueryOp);
-}
-if (rEntry.bQueryByString)
-setString(rEntry.GetQueryString());
-else
-setDouble( rEntry.nVal);
-}
-QueryCriteria( const QueryCriteria  r ) :
-mfVal( r.mfVal),
-mbAlloc( false),
-mbString( false),
-meOp( r.meOp)
-{
-if (r.mbString  r.mpStr)
-{
-mpStr = new String( *r.mpStr);
-mbAlloc = mbString = true;
-}
-}
-~QueryCriteria()
-{
-deleteString();
-}
+explicit QueryCriteria( const ScQueryEntry  rEntry );
+QueryCriteria( const QueryCriteria  r );
+~QueryCriteria();
 
 QueryOp getQueryOp() const { return meOp; }
 
diff --git a/sc/source/core/tool/lookupcache.cxx 
b/sc/source/core/tool/lookupcache.cxx
index 1fbc1ec..3c82a2a 100644
--- a/sc/source/core/tool/lookupcache.cxx
+++ b/sc/source/core/tool/lookupcache.cxx
@@ -31,6 +31,49 @@
 
 #include lookupcache.hxx
 #include document.hxx
+#include queryentry.hxx
+
+ScLookupCache::QueryCriteria::QueryCriteria( const ScQueryEntry rEntry ) :
+mfVal(0.0), mbAlloc(false), mbString(false)
+{
+switch (rEntry.eOp)
+{
+case SC_EQUAL :
+meOp = EQUAL;
+break;
+case SC_LESS_EQUAL :
+meOp = LESS_EQUAL;
+break;
+