date:20111115

[Libreoffice-commits] .: 2 commits - sc/source

2011-11-15 Thread Lionel Elie Mamane

 sc/source/ui/view/auditsh.cxx  |2 -
 sc/source/ui/view/colrowba.cxx |8 ++-
 sc/source/ui/view/dbfunc.cxx   |   44 -
 sc/source/ui/view/viewfunc.cxx |4 +--
 4 files changed, 28 insertions(+), 30 deletions(-)

New commits:
commit 964671497e0b384f6db34c5b7a5d73e26157a47c
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Tue Nov 15 09:03:10 2011 +0100

tweak comment

diff --git a/sc/source/ui/view/dbfunc.cxx b/sc/source/ui/view/dbfunc.cxx
index b1e6a75..77fb8d8 100644
--- a/sc/source/ui/view/dbfunc.cxx
+++ b/sc/source/ui/view/dbfunc.cxx
@@ -226,7 +226,7 @@ void ScDBFunc::NotifyCloseDbNameDlg( const ScDBCollection 
rNewColl, const std::
 std::vectorScRange::const_iterator iter;
 for (iter = rDelAreaList.begin(); iter != rDelAreaList.end(); ++iter)
 {
-//  register target in SBA no longer necessary
+//  registering target in SBA no longer necessary
 const ScAddress rStart = iter-aStart;
 const ScAddress rEnd   = iter-aEnd;
 pDocShell-DBAreaDeleted( rStart.Tab(),
commit 3b442f6909f77613b4bcbc43e3b2193125b5f1df
Author: w.donkers w.donk...@linux-testpc.dci-electronics
Date:   Tue Nov 15 08:03:24 2011 +0100

translations of comments from german to english Committer: Winfried Donkers 
o...@dci-electronics.nl On branch master Changes to be committed: modified: 
sc/source/ui/view/auditsh.cxx modified: sc/source/ui/view/colrowba.cxx 
modified: sc/source/ui/view/dbfunc.cxx modified: sc/source/ui/view/viewfunc.cxx

diff --git a/sc/source/ui/view/auditsh.cxx b/sc/source/ui/view/auditsh.cxx
index 364c412..baf6001 100644
--- a/sc/source/ui/view/auditsh.cxx
+++ b/sc/source/ui/view/auditsh.cxx
@@ -119,7 +119,7 @@ void ScAuditingShell::Execute( SfxRequest rReq )
pReqArgs-GetItemState( SID_RANGE_ROW, sal_True, 
pYItem ) == SFX_ITEM_SET )
 {
 OSL_ENSURE( pXItem-ISA(SfxInt16Item)  
pYItem-ISA(SfxInt32Item),
-falsche Items );
+wrong items );
 SCsCOL nCol = static_castSCsCOL(((const 
SfxInt16Item*) pXItem)-GetValue());
 SCsROW nRow = static_castSCsROW(((const 
SfxInt32Item*) pYItem)-GetValue());
 ScViewFunc* pView = pViewData-GetView();
diff --git a/sc/source/ui/view/colrowba.cxx b/sc/source/ui/view/colrowba.cxx
index 0f24a98..83c5ab9 100644
--- a/sc/source/ui/view/colrowba.cxx
+++ b/sc/source/ui/view/colrowba.cxx
@@ -185,7 +185,7 @@ void ScColBar::SelectWindow()
 {
 ScTabViewShell* pViewSh = pViewData-GetViewShell();
 
-pViewSh-SetActive();   // Appear und SetViewFrame
+pViewSh-SetActive();   // Appear and SetViewFrame
 pViewSh-DrawDeselectAll();
 
 ScSplitPos eActive = pViewData-GetActivePart();
@@ -350,7 +350,7 @@ void ScRowBar::SelectWindow()
 {
 ScTabViewShell* pViewSh = pViewData-GetViewShell();
 
-pViewSh-SetActive();   // Appear und SetViewFrame
+pViewSh-SetActive();   // Appear and SetViewFrame
 pViewSh-DrawDeselectAll();
 
 ScSplitPos eActive = pViewData-GetActivePart();
@@ -398,9 +398,7 @@ String ScRowBar::GetDragHelp( long nVal )
 return lcl_MetricString( nTwips, ScGlobal::GetRscString(STR_TIP_HEIGHT) );
 }
 
-//  GetHiddenCount ist nur fuer Zeilen ueberladen
-
-SCROW ScRowBar::GetHiddenCount( SCROW nEntryNo )
+SCROW ScRowBar::GetHiddenCount( SCROW nEntryNo )   // overloaded only for rows
 {
 ScDocument* pDoc = pViewData-GetDocument();
 SCTAB nTab = pViewData-GetTabNo();
diff --git a/sc/source/ui/view/dbfunc.cxx b/sc/source/ui/view/dbfunc.cxx
index 2498fa3..b1e6a75 100644
--- a/sc/source/ui/view/dbfunc.cxx
+++ b/sc/source/ui/view/dbfunc.cxx
@@ -64,7 +64,7 @@ ScDBFunc::~ScDBFunc()
 }
 
 //
-//  Hilfsfunktionen
+//  auxiliary functions
 //
 
 void ScDBFunc::GotoDBArea( const ::rtl::OUString rDBName )
@@ -92,7 +92,7 @@ void ScDBFunc::GotoDBArea( const ::rtl::OUString rDBName )
 }
 }
 
-//  aktuellen Datenbereich fuer Sortieren / Filtern suchen
+//  get actual datarange for sort / filter search
 
 ScDBData* ScDBFunc::GetDBData( bool bMark, ScGetDBMode eMode, ScGetDBSelection 
eSel )
 {
@@ -210,7 +210,7 @@ ScDBData* ScDBFunc::GetAnonymousDBData()
 return pDocSh-GetAnonymousDBData(aRange);
 }
 
-//  Datenbankbereiche aendern (Dialog)
+//  change database range (dialog)
 
 void ScDBFunc::NotifyCloseDbNameDlg( const ScDBCollection rNewColl, const 
std::vectorScRange rDelAreaList )
 {
@@ -226,7 +226,7 @@ void ScDBFunc::NotifyCloseDbNameDlg( const ScDBCollection 
rNewColl, const std::
 std::vectorScRange::const_iterator iter;
 for (iter = rDelAreaList.begin(); iter != rDelAreaList.end(); ++iter)
 {
-//  Targets am SBA abmelden nicht mehr noetig
+//  register target in SBA no longer necessary
 const ScAddress rStart = iter-aStart;
 const ScAddress rEnd   =

[Libreoffice-commits] .: sc/qa solenv/gbuild

2011-11-15 Thread Stephan Bergmann

 sc/qa/unit/filters-test.cxx|2 +-
 solenv/gbuild/platform/com_GCC_defs.mk |5 +
 solenv/gbuild/platform/macosx.mk   |3 ++-
 solenv/gbuild/platform/solaris.mk  |8 +++-
 solenv/gbuild/platform/unxgcc.mk   |3 ++-
 5 files changed, 17 insertions(+), 4 deletions(-)

New commits:
commit 450c49d93ffe9b49e643ade30a650105b9e5701c
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Tue Nov 15 09:02:41 2011 +0100

add sqlite path to library path and enable testPassword

plus gb_Helper_extend_ld_path normalization by sberg...@redhat.com

diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index 20cf95e..bcda710 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -187,7 +187,7 @@ public:
 CPPUNIT_TEST(testBugFixesODS);
 CPPUNIT_TEST(testBugFixesXLS);
 CPPUNIT_TEST(testBugFixesXLSX);
-//CPPUNIT_TEST(testPassword);
+CPPUNIT_TEST(testPassword);
 
 CPPUNIT_TEST_SUITE_END();
 
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index c73219e..f91b58e 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -117,6 +117,11 @@ endif
 
 gb_Helper_set_ld_path := $(gb_Helper_LIBRARY_PATH_VAR)=$(OUTDIR_FOR_BUILD)/lib
 
+# $(1): list of directory pathnames to append at the end of the ld path
+define gb_Helper_extend_ld_path
+$(gb_Helper_set_ld_path)$(foreach dir,$(1),:$(dir))
+endef
+
 
 # convert parameters filesystem root to native notation
 # does some real work only on windows, make sure not to
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 7fa338a..9d70d0b 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -363,7 +363,8 @@ endef
 
 # CppunitTest class
 
-gb_CppunitTest_CPPTESTPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
+gb_CppunitTest_CPPTESTPRECOMMAND := \
+$(call gb_Helper_extend_ld_path,$(OUTDIR_FOR_BUILD)/lib/sqlite)
 gb_CppunitTest_SYSPRE := libtest_
 gb_CppunitTest_EXT := .dylib
 gb_CppunitTest_LIBDIR := $(gb_Helper_OUTDIRLIBDIR)
diff --git a/solenv/gbuild/platform/solaris.mk 
b/solenv/gbuild/platform/solaris.mk
index 711216a..28dbba8 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -137,6 +137,11 @@ gb_Helper_abbreviate_dirs_native = 
$(gb_Helper_abbreviate_dirs)
 
 gb_Helper_set_ld_path := LD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
 
+# $(1): list of directory pathnames to append at the end of the ld path
+define gb_Helper_extend_ld_path
+$(gb_Helper_set_ld_path)$(foreach dir,$(1),:$(dir))
+endef
+
 # convert parameters filesystem root to native notation
 # does some real work only on windows, make sure not to
 # break the dummy implementations on unx*
@@ -342,7 +347,8 @@ endef
 
 # CppunitTest class
 
-gb_CppunitTest_CPPTESTPRECOMMAND := $(gb_Helper_set_ld_path)
+gb_CppunitTest_CPPTESTPRECOMMAND := \
+$(call gb_Helper_extend_ld_path,$(OUTDIR_FOR_BUILD)/lib/sqlite)
 gb_CppunitTest_SYSPRE := libtest_
 gb_CppunitTest_EXT := .so
 gb_CppunitTest_LIBDIR := $(gb_Helper_OUTDIRLIBDIR)
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index a96f90a..7df93f0 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -362,7 +362,8 @@ endef
 
 # CppunitTest class
 
-gb_CppunitTest_CPPTESTPRECOMMAND := $(gb_Helper_set_ld_path)
+gb_CppunitTest_CPPTESTPRECOMMAND := \
+$(call gb_Helper_extend_ld_path,$(OUTDIR_FOR_BUILD)/lib/sqlite)
 gb_CppunitTest_SYSPRE := libtest_
 gb_CppunitTest_EXT := .so
 gb_CppunitTest_LIBDIR := $(gb_Helper_OUTDIRLIBDIR)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/source

2011-11-15 Thread Lionel Elie Mamane

 sc/source/ui/view/dbfunc.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a5b21ebc93ba34c36ca111c98d90e8f3bd19657b
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Tue Nov 15 09:07:48 2011 +0100

correct comment

diff --git a/sc/source/ui/view/dbfunc.cxx b/sc/source/ui/view/dbfunc.cxx
index 77fb8d8..d78c11e 100644
--- a/sc/source/ui/view/dbfunc.cxx
+++ b/sc/source/ui/view/dbfunc.cxx
@@ -226,7 +226,7 @@ void ScDBFunc::NotifyCloseDbNameDlg( const ScDBCollection 
rNewColl, const std::
 std::vectorScRange::const_iterator iter;
 for (iter = rDelAreaList.begin(); iter != rDelAreaList.end(); ++iter)
 {
-//  registering target in SBA no longer necessary
+// unregistering target in SBA no longer necessary
 const ScAddress rStart = iter-aStart;
 const ScAddress rEnd   = iter-aEnd;
 pDocShell-DBAreaDeleted( rStart.Tab(),
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: git-hooks/commit-msg

2011-11-15 Thread Lionel Elie Mamane

 git-hooks/commit-msg |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5403fa516bb83181d78789cd2cad8ed59c69de1e
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Tue Nov 15 09:13:19 2011 +0100

commit-msg hook: allow commit message that *starts* with an asterisk

diff --git a/git-hooks/commit-msg b/git-hooks/commit-msg
index d51a330..6257213 100755
--- a/git-hooks/commit-msg
+++ b/git-hooks/commit-msg
@@ -32,7 +32,7 @@ test  = $(grep '^Signed-off-by: ' $1 |
 
 # Check that the first line exists, and is not an asterisk
 
-if [ -z `head -n 1 $1 | grep -v '^[ \t]*\*'` ] ; then
+if [ -z `head -n 1 $1 | grep -v '^[ \t]*\*$'` ] ; then
 abort $1 Please provide the general description on the first line.
 fi
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/source

2011-11-15 Thread Stephan Bergmann

 sc/source/ui/view/dbfunc.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 6ed72842cdca2c534ce4984f8e8066703f8a3bdd
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Nov 15 09:15:47 2011 +0100

Tweaked previous comment translations.

diff --git a/sc/source/ui/view/dbfunc.cxx b/sc/source/ui/view/dbfunc.cxx
index d78c11e..d1aff8c 100644
--- a/sc/source/ui/view/dbfunc.cxx
+++ b/sc/source/ui/view/dbfunc.cxx
@@ -92,7 +92,7 @@ void ScDBFunc::GotoDBArea( const ::rtl::OUString rDBName )
 }
 }
 
-//  get actual datarange for sort / filter search
+//  search current datarange for sort / filter
 
 ScDBData* ScDBFunc::GetDBData( bool bMark, ScGetDBMode eMode, ScGetDBSelection 
eSel )
 {
@@ -320,7 +320,7 @@ void ScDBFunc::Query( const ScQueryParam rQueryParam, 
const ScRange* pAdvSource
 sal_Bool bCopy = !rQueryParam.bInplace;
 if (bCopy)
 {
-//  mark target range (data base  range has been set up if 
applicable)
+//  mark target range (data base range has been set up if 
applicable)
 ScDocument* pDoc = pDocSh-GetDocument();
 ScDBData* pDestData = pDoc-GetDBAtCursor(
 rQueryParam.nDestCol, 
rQueryParam.nDestRow,
@@ -422,7 +422,7 @@ void ScDBFunc::ToggleAutoFilter()
 {
 if ( MessBox( GetViewData()-GetDialogParent(), 
WinBits(WB_YES_NO | WB_DEF_YES),
 ScGlobal::GetRscString( STR_MSSG_DOSUBTOTALS_0 ),  
 // StarCalc
-ScGlobal::GetRscString( STR_MSSG_MAKEAUTOFILTER_0 )
 // header from first cell?
+ScGlobal::GetRscString( STR_MSSG_MAKEAUTOFILTER_0 )
 // header from first row?
 ).Execute() == RET_YES )
 {
 pDBData-SetHeader( sal_True ); //! Undo ??
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: instsetoo_native/inc_openoffice

2011-11-15 Thread Andras Timar

 instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 57ecb72e86f68aaea06053d71b1063264a0aa140
Author: Andras Timar ati...@suse.com
Date:   Tue Nov 15 10:58:03 2011 +0100

make Default install/Custom install help text a bit more specific

diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf 
b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
index 7b8b940..a7cc609 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
@@ -620,10 +620,10 @@ en-US =  Back
 en-US = Cancel
 
 [OOO_CONTROL_255]
-en-US = The main components will be installed. Recommended for most users.
+en-US = [ProductName] will be installed with the default components, 
including spelling dictionaries in all available languages.
 
 [OOO_CONTROL_256]
-en-US = Choose which program features you want installed and where they will 
be installed. Recommended for advanced users.
+en-US = Choose which program features you want installed and where they will 
be installed. For example here you can select additional user interface 
languages or deselect unwanted dictionaries.
 
 [OOO_CONTROL_257]
 en-US = Choose the setup type that best suits your needs.
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: set_soenv.in

2011-11-15 Thread Jan Holesovsky

 set_soenv.in |   27 ++-
 1 file changed, 26 insertions(+), 1 deletion(-)

New commits:
commit f616f5050773260f9c03b724b1dd475ead483725
Author: Jan Holesovsky ke...@suse.cz
Date:   Tue Nov 15 11:31:48 2011 +0100

Check for the missing MSVC 2005 runtime libs.

They are needed for the pre-built Mozilla libs.

diff --git a/set_soenv.in b/set_soenv.in
index a05d288..92e2d35 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -819,7 +819,8 @@ if ($platform =~ m/cygwin/)
 # the $OS, $COM, $CPU variables are not yet present there.
 #
 if ( @WITH_MOZILLA@ eq YES and @BUILD_MOZAB@ ne TRUE and 
@SYSTEM_MOZILLA@ ne YES )
-{  print(\nChecking for prebuilt Mozilla libraries ...);
+{
+   print(Checking for prebuilt Mozilla libraries ...);
my $mozbinfile = $SRC_ROOT./moz/zipped/;
if ( $^O eq 'MSWin32' ) {
chomp( $mozbinfile = qx{cygpath -d $mozbinfile} );
@@ -840,6 +841,30 @@ if ( @WITH_MOZILLA@ eq YES and @BUILD_MOZAB@ ne 
TRUE and @SYSTEM_MOZILL
print   http://dev-www.libreoffice.org/mozilla/.\n\n;
die;
}
+   if ( $OS eq 'WNT' ) {
+   my $ext_msvc = $SRC_ROOT./external/msvcp80;
+   chomp( $ext_msvc = qx{cygpath -d $ext_msvc} );
+   print(Checking for MSVC 2005 runtime needed for the prebuilt Mozilla 
...);
+   if ( -e $ext_msvc./Microsoft.VC80.CRT.manifest and
+   -e $ext_msvc./msvcp80.dll and
+   -e $ext_msvc./msvcr80.dll ) 
+   {
+   print  found.\n;
+   }
+   else
+   {   print  not found!\n\n;
+   print For the pre-built Mozilla libraries, you need MSVC 2005 
runtime\n;
+   print files Microsoft.VC80.CRT.manifest, msvcp80.dll, and 
msvcr80.dll\n;
+   print in external/msvcp80.\n\n;
+   print You can get them by installing:\n;
+   print   
http://download.microsoft.com/download/8/B/4/8B42259F-5D70-43F4-AC2E-4B208FD8D66A/vcredist_x86.EXE.\n;
+   print and copying the abovementioned files from:\n;
+   print   
c:/windows/winsxs/x86_Microsoft.VC80.CRT_1fc8b3b9a1e18e3b_8.0.50727.4053_x-ww_e6967989/\n;
+   print and\n;
+   print   
c:/windows/winsxs/manifests/x86_Microsoft.VC80.CRT_1fc8b3b9a1e18e3b_8.0.50727.4053_x-ww_e6967989.manifest\n\n;
+   die;
+   }
+}
 }
 else
 {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: scp2/source

2011-11-15 Thread Andras Timar

 scp2/source/accessories/module_accessories.scp |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit bd3ad390fe76cf0594165233a8304a8f7c96ca77
Author: Andras Timar ati...@suse.com
Date:   Tue Nov 15 12:02:12 2011 +0100

don't list Accessories category when it is empty fdo#37135

diff --git a/scp2/source/accessories/module_accessories.scp 
b/scp2/source/accessories/module_accessories.scp
index ded4717..ef5d390 100644
--- a/scp2/source/accessories/module_accessories.scp
+++ b/scp2/source/accessories/module_accessories.scp
@@ -28,6 +28,8 @@
 
 #include macros.inc
 
+#if defined(WITH_EXTRA_FONT) || defined(WITH_EXTRA_GALLERY) || 
defined(WITH_EXTRA_SAMPLE) || defined(WITH_EXTRA_TEMPLATE)
+
 Module gid_Module_Optional_Accessories
 ParentID = gid_Module_Optional;
 Files = (
@@ -38,3 +40,4 @@ Module gid_Module_Optional_Accessories
 MOD_NAME_DESC(MODULE_OPTIONAL_ACCESSORIES);
 End
 
+#endif
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: editeng/source sw/source

2011-11-15 Thread Michael Meeks

 editeng/source/uno/unotext.cxx|   34 --
 sw/source/filter/xml/xmltexti.cxx |2 +-
 2 files changed, 21 insertions(+), 15 deletions(-)

New commits:
commit aa0b7b033098bfc1bf3f06cd112691abc862bd20
Author: Michael Meeks michael.me...@suse.com
Date:   Sat Nov 12 11:15:19 2011 +

avoid crasher from unusual odt document fdo#42785

diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index ac241d2..5933da3 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -183,6 +183,13 @@ void CheckSelection( struct ESelection rSel, 
SvxTextForwarder* pForwarder ) thr
 }
 }
 
+void CheckSelection( struct ESelection rSel, SvxEditSource *pEdit ) throw()
+{
+if (!pEdit)
+return;
+CheckSelection( rSel, pEdit-GetTextForwarder() );
+}
+
 // 
 // class SvxUnoTextRangeBase
 // 
@@ -275,8 +282,7 @@ void SvxUnoTextRangeBase::SetSelection( const ESelection 
rSelection ) throw()
 SolarMutexGuard aGuard;
 
 maSelection = rSelection;
-if (mpEditSource != NULL)
-CheckSelection( maSelection, mpEditSource-GetTextForwarder() );
+CheckSelection( maSelection, mpEditSource );
 }
 
 // Interface XTextRange ( XText )
@@ -291,7 +297,6 @@ uno::Reference text::XTextRange  SAL_CALL 
SvxUnoTextRangeBase::getStart(void)
 SvxTextForwarder* pForwarder = mpEditSource ? 
mpEditSource-GetTextForwarder() : NULL;
 if( pForwarder )
 {
-
 CheckSelection( maSelection, pForwarder );
 
 SvxUnoTextBase* pText = SvxUnoTextBase::getImplementation( getText() );
@@ -406,7 +411,6 @@ void SAL_CALL SvxUnoTextRangeBase::_setPropertyValue( const 
OUString PropertyNa
 SvxTextForwarder* pForwarder = mpEditSource ? 
mpEditSource-GetTextForwarder() : NULL;
 if( pForwarder )
 {
-
 CheckSelection( maSelection, pForwarder );
 
 const SfxItemPropertySimpleEntry* pMap = 
mpPropSet-getPropertyMapEntry(PropertyName );
@@ -1308,7 +1312,7 @@ uno::Sequence uno::Any  SAL_CALL 
SvxUnoTextRangeBase::getPropertyDefaults( con
 // internal
 void SvxUnoTextRangeBase::CollapseToStart(void) throw()
 {
-CheckSelection( maSelection, mpEditSource-GetTextForwarder() );
+CheckSelection( maSelection, mpEditSource );
 
 maSelection.nEndPara = maSelection.nStartPara;
 maSelection.nEndPos  = maSelection.nStartPos;
@@ -1316,7 +1320,7 @@ void SvxUnoTextRangeBase::CollapseToStart(void) throw()
 
 void SvxUnoTextRangeBase::CollapseToEnd(void) throw()
 {
-CheckSelection( maSelection, mpEditSource-GetTextForwarder() );
+CheckSelection( maSelection, mpEditSource );
 
 maSelection.nStartPara = maSelection.nEndPara;
 maSelection.nStartPos  = maSelection.nEndPos;
@@ -1324,7 +1328,7 @@ void SvxUnoTextRangeBase::CollapseToEnd(void) throw()
 
 sal_Bool SvxUnoTextRangeBase::IsCollapsed(void) throw()
 {
-CheckSelection( maSelection, mpEditSource-GetTextForwarder() );
+CheckSelection( maSelection, mpEditSource );
 
 return ( maSelection.nStartPara == maSelection.nEndPara 
  maSelection.nStartPos  == maSelection.nEndPos );
@@ -1332,7 +1336,7 @@ sal_Bool SvxUnoTextRangeBase::IsCollapsed(void) throw()
 
 sal_Bool SvxUnoTextRangeBase::GoLeft(sal_Int16 nCount, sal_Bool Expand) throw()
 {
-CheckSelection( maSelection, mpEditSource-GetTextForwarder() );
+CheckSelection( maSelection, mpEditSource );
 
 //  #75098# use end position, as in Writer (start is anchor, end is cursor)
 sal_uInt16 nNewPos = maSelection.nEndPos;
@@ -1375,7 +1379,6 @@ sal_Bool SvxUnoTextRangeBase::GoRight(sal_Int16 nCount, 
sal_Bool Expand)  throw(
 {
 CheckSelection( maSelection, pForwarder );
 
-
 sal_uInt16 nNewPos = maSelection.nEndPos + nCount; //! Overflow???
 sal_uInt16 nNewPar = maSelection.nEndPara;
 
@@ -1419,7 +1422,7 @@ void SvxUnoTextRangeBase::GotoStart(sal_Bool Expand) 
throw()
 
 void SvxUnoTextRangeBase::GotoEnd(sal_Bool Expand) throw()
 {
-CheckSelection( maSelection, mpEditSource-GetTextForwarder() );
+CheckSelection( maSelection, mpEditSource );
 
 SvxTextForwarder* pForwarder = mpEditSource ? 
mpEditSource-GetTextForwarder() : NULL;
 if( pForwarder )
@@ -1670,8 +1673,11 @@ void SAL_CALL SvxUnoTextBase::insertString( const 
uno::Reference text::XTextRan
 return;
 
 ESelection aSelection;
-::GetSelection( aSelection, GetEditSource()-GetTextForwarder() );
-SetSelection( aSelection );
+if (GetEditSource())
+{
+::GetSelection( aSelection, GetEditSource()-GetTextForwarder() );
+SetSelection( aSelection );
+}
 
 SvxUnoTextRangeBase* pRange = SvxUnoTextRange::getImplementation( xRange );
 if(pRange)
@@ -1771,10 +1777,10 @@ void SAL_CALL SvxUnoTextBase::insertControlCharacter( 
const uno::Reference text
 return;
 }

[Libreoffice-commits] .: 2 commits - configure.in desktop/unx

2011-11-15 Thread Tomáš Chvátal

 configure.in   |2 +-
 desktop/unx/source/start.c |5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 2264f482e57e989e649934d3980368f2b135d496
Author: Tomas Chvatal tchva...@suse.cz
Date:   Tue Nov 15 12:34:12 2011 +0100

Use proper switch for on/of qstart-libpng.

diff --git a/configure.in b/configure.in
index 34400e7..6ae1fbb 100644
--- a/configure.in
+++ b/configure.in
@@ -7013,7 +7013,7 @@ AC_SUBST(LIBPNG_LIBS)
 AC_SUBST(LIBPNG_CFLAGS)
 
 AC_MSG_CHECKING([whether to enable libpng linking in quickstarter])
-if test x$enable_unix_libpng = xyes; then
+if test x$unix_qstart_libpng != xno; then
 AC_MSG_RESULT([yes])
 else
 AC_MSG_RESULT([no])
commit 4fe54ea11ed82dd662d0132585c199ec9f3a6c95
Author: Tomas Chvatal tchva...@suse.cz
Date:   Tue Nov 15 12:33:49 2011 +0100

Instead of returning out of function just skip its calling.

diff --git a/desktop/unx/source/start.c b/desktop/unx/source/start.c
index 940a997..6152e4c 100644
--- a/desktop/unx/source/start.c
+++ b/desktop/unx/source/start.c
@@ -697,9 +697,6 @@ static void extend_library_path (const char *new_element)
 static void
 exec_javaldx (Args *args)
 {
-#ifndef SOLAR_JAVA
-return;
-#endif
 char newpath[4096];
 sal_uInt32 nArgs;
 rtl_uString *pApp;
@@ -858,8 +855,10 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS( argc, argv )
 exec_pagein (args);
 
 /* javaldx */
+#ifdef SOLAR_JAVA
 if (!args-bInhibitJavaLdx)
 exec_javaldx (args);
+#endif
 
 do
 {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basebmp/inc basebmp/test

2011-11-15 Thread Thorsten Behrens

 basebmp/inc/basebmp/clippedlinerenderer.hxx |   55 --
 basebmp/inc/basebmp/debug.hxx   |   10 ++
 basebmp/test/linetest.cxx   |   33 
 basebmp/test/polytest.cxx   |  105 ++--
 4 files changed, 173 insertions(+), 30 deletions(-)

New commits:
commit b53d2bc9dd92079c030346af57e9b1a0078a05e7
Author: Thorsten Behrens tbehr...@suse.com
Date:   Tue Nov 15 12:24:52 2011 +0100

Fix clipped line renderer.

Fix for a nasty corner case where supposedly clipped pixel were
still rasterized (see polytest.cxx:implTestPolyDrawClip for what
failed previously).

Added much more unit tests while at it, clippedlinerenderer.hxx
should now have 100% coverage.

diff --git a/basebmp/inc/basebmp/clippedlinerenderer.hxx 
b/basebmp/inc/basebmp/clippedlinerenderer.hxx
index d1c06f6..01262c0 100644
--- a/basebmp/inc/basebmp/clippedlinerenderer.hxx
+++ b/basebmp/inc/basebmp/clippedlinerenderer.hxx
@@ -65,7 +65,8 @@ inline bool prepareClip( sal_Int32  a1,
  sal_uInt32 bMinFlag,
  sal_Int32  bMax,
  sal_uInt32 bMaxFlag,
- bool   bRoundTowardsPt2 )
+ bool   bRoundTowardsPt2,
+ bool  o_bUseAlternateBresenham )
 {
 int ca(0), cb(0);
 if( clipCode1 )
@@ -103,13 +104,13 @@ inline bool prepareClip( sal_Int32  a1,
 {
 o_bs = b1 + cb;
 if( o_bs  bMax )
-return false;
+return false; // fully clipped
 }
 else
 {
 o_bs = b1 - cb;
 if( o_bs  bMin )
-return false;
+return false; // fully clipped
 }
 
 io_rem += ca - 2*da*cb;
@@ -121,13 +122,13 @@ inline bool prepareClip( sal_Int32  a1,
 {
 o_as = a1 + ca;
 if( o_as  aMax )
-return false;
+return false; // fully clipped
 }
 else
 {
 o_as = a1 - ca;
 if( o_as  aMin )
-return false;
+return false; // fully clipped
 }
 
 io_rem += 2*db*ca - cb;
@@ -138,7 +139,6 @@ inline bool prepareClip( sal_Int32  a1,
 o_as = a1; o_bs = b1;
 }
 
-bool bRetVal = false;
 if( clipCode2 )
 {
 if( clipCount2 == 2 )
@@ -153,13 +153,13 @@ inline bool prepareClip( sal_Int32  a1,
 else
 {
 o_n = (clipCode2  bMinFlag) ? o_bs - bMin : bMax - o_bs;
-bRetVal = true;
+o_bUseAlternateBresenham = true;
 }
 }
 else
 o_n = (a2 = o_as) ? a2 - o_as : o_as - a2;
 
-return bRetVal;
+return true; // at least one pixel to render
 }
 
 
@@ -214,7 +214,7 @@ void renderClippedLine( basegfx::B2IPoint aPt1,

rClipRect);
 
 if( clipCode1  clipCode2 )
-return; // line fully clipped away
+return; // line fully clipped away, both endpoints share a half-plane
 
 sal_uInt32 clipCount1 = basegfx::tools::getNumberOfClipPlanes(clipCode1);
 sal_uInt32 clipCount2 = basegfx::tools::getNumberOfClipPlanes(clipCode2);
@@ -254,19 +254,20 @@ void renderClippedLine( basegfx::B2IPoint 
aPt1,
 int n  = 0;
 sal_Int32 xs = x1;
 sal_Int32 ys = y1;
+bool bUseAlternateBresenham=false;
 if( adx = ady )
 {
 // semi-horizontal line
 sal_Int32 rem = 2*ady - adx - !bRoundTowardsPt2;
 
-const bool bUseAlternateBresenham(
-prepareClip(x1, x2, y1, adx, ady, xs, ys, sx, sy,
-rem, n, clipCode1, clipCount1, clipCode2, clipCount2,
-rClipRect.getMinX(), 
basegfx::tools::RectClipFlags::LEFT,
-rClipRect.getMaxX()-1, 
basegfx::tools::RectClipFlags::RIGHT,
-rClipRect.getMinY(), 
basegfx::tools::RectClipFlags::TOP,
-rClipRect.getMaxY()-1, 
basegfx::tools::RectClipFlags::BOTTOM,
-bRoundTowardsPt2 ));
+if( !prepareClip(x1, x2, y1, adx, ady, xs, ys, sx, sy,
+ rem, n, clipCode1, clipCount1, clipCode2, clipCount2,
+ rClipRect.getMinX(), 
basegfx::tools::RectClipFlags::LEFT,
+ rClipRect.getMaxX()-1, 
basegfx::tools::RectClipFlags::RIGHT,
+ rClipRect.getMinY(), 
basegfx::tools::RectClipFlags::TOP,
+ rClipRect.getMaxY()-1, 
basegfx::tools::RectClipFlags::BOTTOM,
+ bRoundTowardsPt2, bUseAlternateBresenham ) )
+return; // line fully clipped away, no active pixel inside rect
 
 Iterator

[Libreoffice-commits] .: 2 commits - default_images/res ooo_custom_images/crystal ooo_custom_images/hicontrast ooo_custom_images/human ooo_custom_images/industrial ooo_custom_images/oxygen ooo_custom_

2011-11-15 Thread Noel Power

 default_images/res/lx03128.png   |binary
 default_images/res/lx03252.png   |binary
 default_images/res/otg_16_8.png  |binary
 default_images/res/otg_32_8.png  |binary
 default_images/res/otg_48_8.png  |binary
 default_images/res/sx03128.png   |binary
 default_images/res/sx03252.png   |binary
 ooo_custom_images/crystal/res/lx03139.png|binary
 ooo_custom_images/crystal/res/sx03139.png|binary
 ooo_custom_images/hicontrast/res/lx03128.png |binary
 ooo_custom_images/hicontrast/res/lx03139.png |binary
 ooo_custom_images/hicontrast/res/lx03252.png |binary
 ooo_custom_images/hicontrast/res/sx03128.png |binary
 ooo_custom_images/hicontrast/res/sx03139.png |binary
 ooo_custom_images/hicontrast/res/sx03252.png |binary
 ooo_custom_images/human/res/lx03128.png  |binary
 ooo_custom_images/human/res/lx03139.png  |binary
 ooo_custom_images/human/res/lx03252.png  |binary
 ooo_custom_images/human/res/sx03128.png  |binary
 ooo_custom_images/human/res/sx03139.png  |binary
 ooo_custom_images/human/res/sx03252.png  |binary
 ooo_custom_images/industrial/res/lx03128.png |binary
 ooo_custom_images/industrial/res/lx03139.png |binary
 ooo_custom_images/industrial/res/lx03252.png |binary
 ooo_custom_images/industrial/res/sx03128.png |binary
 ooo_custom_images/industrial/res/sx03139.png |binary
 ooo_custom_images/industrial/res/sx03252.png |binary
 ooo_custom_images/oxygen/res/lx03128.png |binary
 ooo_custom_images/oxygen/res/lx03139.png |binary
 ooo_custom_images/oxygen/res/lx03252.png |binary
 ooo_custom_images/oxygen/res/otg_16_8.png|binary
 ooo_custom_images/oxygen/res/otg_32_8.png|binary
 ooo_custom_images/oxygen/res/otg_48_8.png|binary
 ooo_custom_images/oxygen/res/oth_16_8.png|binary
 ooo_custom_images/oxygen/res/oth_32_8.png|binary
 ooo_custom_images/oxygen/res/oth_48_8.png|binary
 ooo_custom_images/oxygen/res/sx03128.png |binary
 ooo_custom_images/oxygen/res/sx03139.png |binary
 ooo_custom_images/oxygen/res/sx03252.png |binary
 ooo_custom_images/tango/res/lx03128.png  |binary
 ooo_custom_images/tango/res/lx03139.png  |binary
 ooo_custom_images/tango/res/lx03252.png  |binary
 ooo_custom_images/tango/res/sx03128.png  |binary
 ooo_custom_images/tango/res/sx03139.png  |binary
 ooo_custom_images/tango/res/sx03252.png  |binary
 vcl/inc/svids.hrc|3 +
 vcl/source/src/images.src|   75 +++
 47 files changed, 78 insertions(+)

New commits:
commit a1cc4e507cb6547d7715be09bff29366424c09fe
Author: Noel Power noel.po...@novell.com
Date:   Tue Nov 15 12:41:57 2011 +

Revert FDO#42454 - EasyHack: remove code associated with unused icons

This reverts commit 3e26dfcc2d347f4e0914449ca8104c8969fc6281.

diff --git a/default_images/res/lx03128.png b/default_images/res/lx03128.png
new file mode 100644
index 000..309e882
Binary files /dev/null and b/default_images/res/lx03128.png differ
diff --git a/default_images/res/lx03252.png b/default_images/res/lx03252.png
new file mode 100644
index 000..3bd7387
Binary files /dev/null and b/default_images/res/lx03252.png differ
diff --git a/default_images/res/otg_16_8.png b/default_images/res/otg_16_8.png
new file mode 100644
index 000..4bb2bfe
Binary files /dev/null and b/default_images/res/otg_16_8.png differ
diff --git a/default_images/res/otg_32_8.png b/default_images/res/otg_32_8.png
new file mode 100644
index 000..b3c0823
Binary files /dev/null and b/default_images/res/otg_32_8.png differ
diff --git a/default_images/res/otg_48_8.png b/default_images/res/otg_48_8.png
new file mode 100644
index 000..7544b6f
Binary files /dev/null and b/default_images/res/otg_48_8.png differ
diff --git a/default_images/res/sx03128.png b/default_images/res/sx03128.png
new file mode 100644
index 000..a24df73
Binary files /dev/null and b/default_images/res/sx03128.png differ
diff --git a/default_images/res/sx03252.png b/default_images/res/sx03252.png
new file mode 100644
index 000..456b810
Binary files /dev/null and b/default_images/res/sx03252.png differ
diff --git a/ooo_custom_images/crystal/res/lx03139.png 
b/ooo_custom_images/crystal/res/lx03139.png
new file mode 100644
index 000..4113176
Binary files /dev/null and b/ooo_custom_images/crystal/res/lx03139.png differ
diff --git a/ooo_custom_images/crystal/res/sx03139.png 
b/ooo_custom_images/crystal/res/sx03139.png
new file mode 100644
index 000..e746e6b
Binary files /dev/null and b/ooo_custom_images/crystal/res/sx03139.png differ
diff --git a/ooo_custom_images/hicontrast/res/lx03128.png 
b/ooo_custom_images/hicontrast/res/lx03128.png
new file mode 100644
index 000..d03948b
Binary files /dev/null and b/ooo_custom_images/hicontrast/res/lx03128.png differ
diff --git a/ooo_custom_images/hicontrast/res/lx03139.png 
b/ooo_custom_images/hicontrast/res/lx03139.png

[Libreoffice-commits] .: default_images/starmath extras/source starmath/inc starmath/source testautomation/framework testautomation/global testautomation/math

2011-11-15 Thread Caolán McNamara

 default_images/starmath/res/bi21327.png
   |binary
 default_images/starmath/res/bi21328.png
   |binary
 default_images/starmath/res/bi21329.png
   |binary
 default_images/starmath/res/bi21330.png
   |binary
 default_images/starmath/res/bi21331.png
   |binary
 default_images/starmath/res/bi21332.png
   |binary
 default_images/starmath/res/bi21333.png
   |binary
 default_images/starmath/res/bi21334.png
   |binary
 extras/source/truetype/symbol/OpenSymbol.sfd   
   |  264 +-
 extras/source/truetype/symbol/opens___.ttf 
   |binary
 starmath/inc/helpids.h 
   |8 
 starmath/inc/parse.hxx 
   |3 
 starmath/inc/starmath.hrc  
   |   11 
 starmath/inc/types.hxx 
   |   11 
 starmath/source/commands.src   
   |   61 ++
 starmath/source/mathtype.cxx   
   |   28 -
 starmath/source/parse.cxx  
   |8 
 starmath/source/toolbox.cxx
   |4 
 starmath/source/toolbox.src
   |   70 ++
 
testautomation/framework/optional/input/help_browser/OpenOffice.org_help_topics_en-US.txt
 |   10 
 
testautomation/framework/optional/input/help_browser/Oracle_Open_Office_help_topics_en-US.txt
 |   10 
 testautomation/global/win/e_mathop.win 
   |8 
 testautomation/global/win/mathop.win   
   |8 
 testautomation/math/required/includes/m_010_.inc   
   |   17 
 24 files changed, 504 insertions(+), 17 deletions(-)

New commits:
commit cfc84011b3fb609ac78f35666d9aecda4ca34678
Author: Olivier Hallot olivier.hal...@alta.org.br
Date:   Tue Nov 15 13:34:43 2011 +

Fix for fdo#42892: Add new symbols to Math

diff --git a/default_images/starmath/res/bi21327.png 
b/default_images/starmath/res/bi21327.png
new file mode 100644
index 000..134c4f5
Binary files /dev/null and b/default_images/starmath/res/bi21327.png differ
diff --git a/default_images/starmath/res/bi21328.png 
b/default_images/starmath/res/bi21328.png
new file mode 100644
index 000..f16cd7a
Binary files /dev/null and b/default_images/starmath/res/bi21328.png differ
diff --git a/default_images/starmath/res/bi21329.png 
b/default_images/starmath/res/bi21329.png
new file mode 100644
index 000..937e5e0
Binary files /dev/null and b/default_images/starmath/res/bi21329.png differ
diff --git a/default_images/starmath/res/bi21330.png 
b/default_images/starmath/res/bi21330.png
new file mode 100644
index 000..0e28345
Binary files /dev/null and b/default_images/starmath/res/bi21330.png differ
diff --git a/default_images/starmath/res/bi21331.png 
b/default_images/starmath/res/bi21331.png
new file mode 100644
index 000..0517f74
Binary files /dev/null and b/default_images/starmath/res/bi21331.png differ
diff --git a/default_images/starmath/res/bi21332.png 
b/default_images/starmath/res/bi21332.png
new file mode 100644
index 000..97bca2f
Binary files /dev/null and b/default_images/starmath/res/bi21332.png differ
diff --git a/default_images/starmath/res/bi21333.png 
b/default_images/starmath/res/bi21333.png
new file mode 100644
index 000..01488d2
Binary files /dev/null and b/default_images/starmath/res/bi21333.png differ
diff --git a/default_images/starmath/res/bi21334.png 
b/default_images/starmath/res/bi21334.png
new file mode 100644
index 000..7a7f138
Binary files /dev/null and b/default_images/starmath/res/bi21334.png differ
diff --git a/extras/source/truetype/symbol/OpenSymbol.sfd 
b/extras/source/truetype/symbol/OpenSymbol.sfd
index e31f894..49b35f1 100644
--- a/extras/source/truetype/symbol/OpenSymbol.sfd
+++ b/extras/source/truetype/symbol/OpenSymbol.sfd
@@ -3,8 +3,8 @@ FontName: OpenSymbol
 FullName: OpenSymbol
 FamilyName: OpenSymbol
 Weight: Book
-Copyright: (c) 2009 Sun Microsystems Inc.; THERE DOES NOT EXIST (c)\n2011 
Julien Nabet
-Version: 102.1
+Copyright: (c) 2009 Sun Microsystems Inc.\nTHERE DOES NOT

[Libreoffice-commits] .: sc/source

2011-11-15 Thread Kohei Yoshida

 sc/source/ui/dbgui/filtdlg.cxx |  128 -
 sc/source/ui/inc/filtdlg.hxx   |   10 +--
 2 files changed, 69 insertions(+), 69 deletions(-)

New commits:
commit feed4386a664feed09daff81b50e45889651f559
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Tue Nov 15 09:46:29 2011 -0500

C-style array to std::vector.

diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx
index 74960bc..aff212b 100644
--- a/sc/source/ui/dbgui/filtdlg.cxx
+++ b/sc/source/ui/dbgui/filtdlg.cxx
@@ -60,16 +60,10 @@
 using ::rtl::OUString;
 using ::rtl::OUStringBuffer;
 
-// DEFINE 
-
 #define ERRORBOX(rid)   ErrorBox( this, WinBits( WB_OK|WB_DEF_OK), \
ScGlobal::GetRscString(rid) ).Execute()
 
-
-//
-//  class ScFilterDlg
-
-//
+#define QUERY_ENTRY_COUNT 4
 
 ScFilterDlg::ScFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* 
pParent,
   const SfxItemSet rArgSet )
@@ -258,22 +252,26 @@ void ScFilterDlg::Init( const SfxItemSet rArgSet )
 nSrcTab = pViewData ? pViewData-GetTabNo() : static_castSCTAB(0);
 
 // for easier access:
-aFieldLbArr  [0] = aLbField1;
-aFieldLbArr  [1] = aLbField2;
-aFieldLbArr  [2] = aLbField3;
-aFieldLbArr  [3] = aLbField4;
-aValueEdArr  [0] = aEdVal1;
-aValueEdArr  [1] = aEdVal2;
-aValueEdArr  [2] = aEdVal3;
-aValueEdArr  [3] = aEdVal4;
-aCondLbArr   [0] = aLbCond1;
-aCondLbArr   [1] = aLbCond2;
-aCondLbArr   [2] = aLbCond3;
-aCondLbArr   [3] = aLbCond4;
-aConnLbArr   [0] = aLbConnect1;
-aConnLbArr   [1] = aLbConnect2;
-aConnLbArr   [2] = aLbConnect3;
-aConnLbArr   [3] = aLbConnect4;
+maFieldLbArr.reserve(QUERY_ENTRY_COUNT);
+maFieldLbArr.push_back(aLbField1);
+maFieldLbArr.push_back(aLbField2);
+maFieldLbArr.push_back(aLbField3);
+maFieldLbArr.push_back(aLbField4);
+maValueEdArr.reserve(QUERY_ENTRY_COUNT);
+maValueEdArr.push_back(aEdVal1);
+maValueEdArr.push_back(aEdVal2);
+maValueEdArr.push_back(aEdVal3);
+maValueEdArr.push_back(aEdVal4);
+maCondLbArr.reserve(QUERY_ENTRY_COUNT);
+maCondLbArr.push_back(aLbCond1);
+maCondLbArr.push_back(aLbCond2);
+maCondLbArr.push_back(aLbCond3);
+maCondLbArr.push_back(aLbCond4);
+maConnLbArr.reserve(QUERY_ENTRY_COUNT);
+maConnLbArr.push_back(aLbConnect1);
+maConnLbArr.push_back(aLbConnect2);
+maConnLbArr.push_back(aLbConnect3);
+maConnLbArr.push_back(aLbConnect4);
 
 // Option initialization:
 
@@ -301,7 +299,7 @@ void ScFilterDlg::Init( const SfxItemSet rArgSet )
 
 FillFieldLists();
 
-for ( SCSIZE i=0; i4; i++ )
+for (size_t i = 0; i  QUERY_ENTRY_COUNT; ++i)
 {
 String  aValStr;
 sal_uInt16  nCondPos = 0;
@@ -316,12 +314,12 @@ void ScFilterDlg::Init( const SfxItemSet rArgSet )
 if (rEntry.IsQueryByEmpty())
 {
 aValStr = aStrEmpty;
-aCondLbArr[i]-Disable();
+maCondLbArr[i]-Disable();
 }
 else if (rEntry.IsQueryByNonEmpty())
 {
 aValStr = aStrNotEmpty;
-aCondLbArr[i]-Disable();
+maCondLbArr[i]-Disable();
 }
 else
 aValStr = rItem.maString;
@@ -337,11 +335,11 @@ void ScFilterDlg::Init( const SfxItemSet rArgSet )
 maRefreshExceptQuery[i] = true;
 
 }
-aFieldLbArr[i]-SelectEntryPos( nFieldSelPos );
-aCondLbArr [i]-SelectEntryPos( nCondPos );
-aValueEdArr[i]-SetText( aValStr );
-aValueEdArr[i]-EnableAutocomplete( false );
-aValueEdArr[i]-SetModifyHdl( LINK( this, ScFilterDlg, ValModifyHdl ) 
);
+maFieldLbArr[i]-SelectEntryPos( nFieldSelPos );
+maCondLbArr [i]-SelectEntryPos( nCondPos );
+maValueEdArr[i]-SetText( aValStr );
+maValueEdArr[i]-EnableAutocomplete( false );
+maValueEdArr[i]-SetModifyHdl( LINK( this, ScFilterDlg, ValModifyHdl ) 
);
 UpdateValueList( static_castsal_uInt16(i+1) );
 }
 
@@ -508,10 +506,10 @@ void ScFilterDlg::FillFieldLists()
 
 void ScFilterDlg::UpdateValueList( sal_uInt16 nList )
 {
-if ( pDoc  nList0  nList=4 )
+if (pDoc  nList  0  nList = QUERY_ENTRY_COUNT)
 {
-ComboBox*   pValList= aValueEdArr[nList-1];
-sal_uInt16  nFieldSelPos= 
aFieldLbArr[nList-1]-GetSelectEntryPos();
+ComboBox*   pValList= maValueEdArr[nList-1];
+sal_uInt16  nFieldSelPos= 
maFieldLbArr[nList-1]-GetSelectEntryPos();
 sal_uInt16  nListPos= 0;
 String  aCurValue   = pValList-GetText();
 
@@ -587,9 +585,9 @@ void

[Libreoffice-commits] .: oox/source

2011-11-15 Thread Muthu Subramanian

 oox/source/drawingml/textbodypropertiescontext.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a8b0407fef14cd89e3eb571c88ce3cb9edf70149
Author: Muthu Subramanian sumu...@suse.com
Date:   Tue Nov 15 21:13:18 2011 +0530

n#592912 and n#621744: Text Alignment fixes.

diff --git a/oox/source/drawingml/textbodypropertiescontext.cxx 
b/oox/source/drawingml/textbodypropertiescontext.cxx
index 083cccf..3c77a35 100644
--- a/oox/source/drawingml/textbodypropertiescontext.cxx
+++ b/oox/source/drawingml/textbodypropertiescontext.cxx
@@ -152,7 +152,7 @@ TextBodyPropertiesContext::TextBodyPropertiesContext( 
ContextHandler rParent,
 mrTextBodyProp.maPropertyMap[ PROP_TextHorizontalAdjust ] =
 TextHorizontalAdjust_RIGHT;
 }
-else
+else if( mrTextBodyProp.moVert.get( XML_horz ) == XML_horz )
 mrTextBodyProp.maPropertyMap[ PROP_TextVerticalAdjust ] = eVA;
 }
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: dbaccess/source

2011-11-15 Thread Bjoern Michaelsen

 dbaccess/source/ui/browser/dbtreeview.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6bfc7f28e6d3454fa90d6c32b36cd9bf898ba933
Author: Michael Meeks michael.me...@suse.com
Date:   Tue Nov 15 17:35:36 2011 +0100

 Address data source ordering x#62860

information from the apply file:
 patchname: addrbk-datasrc-ordering.diff
 issues:
 author: michael
 section: Misc
 comment:
  Address data source ordering x#62860
 sectioncomment:

git log from build repository:
commit bfa619922b90a021e5d856333dd398512389ad67
Author: Jan Holesovsky ke...@suse.cz
Date:   Mon Jun 21 22:11:19 2010 +0200

Update patches to dev300-m83.

* [...]

commit 256381886a238d80b9ddab795b500576d92404cc
Author: Jan Holesovsky ke...@suse.cz
Date:   Wed May 19 12:16:00 2010 +0200

Updated patches do dev300-m77.

* [...]

commit df913735fd729978d20f0282fe32d14bf597891f
Author: Jan Holesovsky ke...@suse.cz
Date:   Mon May 17 01:21:36 2010 +0200

Patches adopted to the tabs - spaces fixes + trailing whitespace 
cleanup.

* [...]

commit c6847e9b022184e98942391a2b5711c31eb25ba3
Author: Jan Holesovsky ke...@suse.cz
Date:   Fri May 14 14:32:23 2010 +0200

Convert tabs to spaces in all the code introduced by the patches.

* [...]

commit 09774df8a62bf886c78c0f84d56b2d518ae8107e
Author: Jan Holesovsky ke...@suse.cz
Date:   Tue Apr 29 14:04:53 2008 +

Src680/

* Some cleaning action: src680/* - dev300/

* patches/dev300/gstreamer-sd.diff,
patches/dev300/gstreamer-slideshow.diff,
patches/dev300/letter-wizard-resource-id.diff: Moved to
patches/gstreamer.

* patches/dev300/mono-build.diff: Moved to patches/mono.

* patches/dev300/sc-hacky-handle-boolean.diff,
patches/dev300/vba-workbook-worksheet-events.diff: Moved to
patches/vba.

* patches/src680/unittesting-*: Moved...
patches/unittesting/*: ...here.

* patches/src680/*: Moved...
patches/dev300/*: ...here.

* patches/dev300/apply,
patches/Makefile.am: Add the unittesting subdir, remove src680.

diff --git a/dbaccess/source/ui/browser/dbtreeview.cxx 
b/dbaccess/source/ui/browser/dbtreeview.cxx
index b69c67b..25fee5b 100644
--- a/dbaccess/source/ui/browser/dbtreeview.cxx
+++ b/dbaccess/source/ui/browser/dbtreeview.cxx
@@ -53,7 +53,7 @@ DBTreeView::DBTreeView( Window* pParent, const Reference 
XMultiServiceFactory 
 {
 DBG_CTOR(DBTreeView,NULL);
 
-m_pTreeListBox = new DBTreeListBox(this, _rxORB ,WB_HASLINES | WB_SORT | 
WB_HASBUTTONS | WB_HSCROLL |WB_HASBUTTONSATROOT,sal_True);
+m_pTreeListBox = new DBTreeListBox(this, _rxORB ,WB_BORDER | WB_HASLINES | 
WB_HASLINESATROOT | WB_HASBUTTONS | WB_HSCROLL |WB_HASBUTTONSATROOT);
 m_pTreeListBox-EnableCheckButton(NULL);
 m_pTreeListBox-SetDragDropMode( 0 );
 m_pTreeListBox-EnableInplaceEditing( sal_True );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/source

2011-11-15 Thread Bjoern Michaelsen

 sw/source/ui/dbui/dbtree.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 03324dbbe2c0973a2f71c77cc72d852314b8da77
Author: Michael Meeks michael.me...@suse.com
Date:   Tue Nov 15 18:02:39 2011 +0100

Address data source ordering x#62860 (part 2)

diff --git a/sw/source/ui/dbui/dbtree.cxx b/sw/source/ui/dbui/dbtree.cxx
index ec7294e..3804eaa 100644
--- a/sw/source/ui/dbui/dbtree.cxx
+++ b/sw/source/ui/dbui/dbtree.cxx
@@ -216,7 +216,7 @@ void SwDBTreeList::InitTreeList()
 if(!pImpl-HasContext()  pImpl-GetWrtShell())
 return;
 SetSelectionMode(SINGLE_SELECTION);
-
SetStyle(GetStyle()|WB_HASLINES|WB_CLIPCHILDREN|WB_SORT|WB_HASBUTTONS|WB_HASBUTTONSATROOT|WB_HSCROLL);
+
SetStyle(GetStyle()|WB_HASLINES|WB_CLIPCHILDREN|WB_HASBUTTONS|WB_HASBUTTONSATROOT|WB_HSCROLL);
 // don't set font, so that the Control's font is being applied!
 SetSpaceBetweenEntries(0);
 SetNodeBitmaps( aImageList.GetImage(IMG_COLLAPSE),
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 3 commits - default_images/res ooo_custom_images/crystal ooo_custom_images/hicontrast ooo_custom_images/human ooo_custom_images/industrial ooo_custom_images/oxygen ooo_custom_

2011-11-15 Thread Noel Power

 dev/null |binary
 svtools/source/misc/imagemgr.src |3 -
 vcl/inc/svids.hrc|3 -
 vcl/source/src/images.src|   75 ---
 4 files changed, 81 deletions(-)

New commits:
commit 240dc332ad59fc2c45eccb4b2f4923fde09a784b
Author: Noel Power noel.po...@novell.com
Date:   Tue Nov 15 17:13:38 2011 +

fix build error, remove still referenced (indirectly ) images

diff --git a/svtools/source/misc/imagemgr.src b/svtools/source/misc/imagemgr.src
index 62104ea..d1d25c8 100644
--- a/svtools/source/misc/imagemgr.src
+++ b/svtools/source/misc/imagemgr.src
@@ -35,7 +35,6 @@
 IMG_IMPRESS ;   \
 IMG_CALC ;  \
 IMG_CALCTEMPLATE ;  \
-IMG_CHART ; \
 IMG_IMPRESSTEMPLATE ;   \
 IMG_HTML ;  \
 IMG_MATH ;  \
@@ -51,7 +50,6 @@
 IMG_CALC ; \
 IMG_CALCTEMPLATE ; \
 IMG_CDROMDEV ; \
-IMG_CHART ; \
 IMG_DATABASE ; \
 IMG_DRAW ; \
 IMG_DRAWTEMPLATE ; \
@@ -74,7 +72,6 @@
 IMG_OO_CALC_TEMPLATE ; \
 IMG_OO_DATABASE_DOC ; \
 IMG_OO_DRAW_DOC ; \
-IMG_OO_DRAW_TEMPLATE ; \
 IMG_OO_GLOBAL_DOC ; \
 IMG_OO_IMPRESS_DOC ; \
 IMG_OO_IMPRESS_TEMPLATE ; \
commit 0d56c77726be9d9c23a87ae214d989a7bf2e2ddf
Author: Noel Power noel.po...@novell.com
Date:   Tue Nov 15 11:24:04 2011 +

remove unused SV_ICON_ID_HTML_DOCUMENT entries

diff --git a/vcl/inc/svids.hrc b/vcl/inc/svids.hrc
index 51a0791..f0dce63 100644
--- a/vcl/inc/svids.hrc
+++ b/vcl/inc/svids.hrc
@@ -259,7 +259,6 @@
 #define SV_ICON_ID_PRESENTATION_TEMPLATE9
 #define SV_ICON_ID_PRESENTATION_COMPRESSED 10
 #define SV_ICON_ID_MASTER_DOCUMENT 11
-#define SV_ICON_ID_HTML_DOCUMENT   12
 #define SV_ICON_ID_DATABASE14
 #define SV_ICON_ID_FORMULA 15
 #define SV_ICON_ID_TEMPLATE16
diff --git a/vcl/source/src/images.src b/vcl/source/src/images.src
index d99f9f9..5f6dace 100644
--- a/vcl/source/src/images.src
+++ b/vcl/source/src/images.src
@@ -264,21 +264,6 @@ Bitmap (SV_ICON_SIZE16_START + SV_ICON_ID_MASTER_DOCUMENT)
 File = odm_16_8.png ;
 };
 
-Bitmap (SV_ICON_SIZE48_START + SV_ICON_ID_HTML_DOCUMENT)
-{
-File = oth_48_8.png ;
-};
-
-Bitmap (SV_ICON_SIZE32_START + SV_ICON_ID_HTML_DOCUMENT)
-{
-File = oth_32_8.png ;
-};
-
-Bitmap (SV_ICON_SIZE16_START + SV_ICON_ID_HTML_DOCUMENT)
-{
-File = oth_16_8.png ;
-};
-
 Bitmap (SV_ICON_SIZE48_START + SV_ICON_ID_DATABASE)
 {
 File = odb_48_8.png ;
@@ -467,16 +452,6 @@ Bitmap (SV_ICON_SMALL_START + SV_ICON_ID_MASTER_DOCUMENT)
 File = sx03248.png ;
 };
 
-Bitmap (SV_ICON_LARGE_START + SV_ICON_ID_HTML_DOCUMENT)
-{
-File = lx03139.png ;
-};
-
-Bitmap (SV_ICON_SMALL_START + SV_ICON_ID_HTML_DOCUMENT)
-{
-File = sx03139.png ;
-};
-
 Bitmap (SV_ICON_LARGE_START + SV_ICON_ID_DATABASE)
 {
 File = lx03245.png ;
commit e0e7c5dc46ac8fd0c7f6fdc0ceb62d15cafd3754
Author: Julien Chaffraix julien.chaffr...@gmail.com
Date:   Mon Nov 14 07:23:08 2011 -0800

FDO#42454 - EasyHack: remove code associated with unused icons

Removed the icons and code associated with:
SV_ICON_ID_CHART
SV_ICON_ID_DRAWING_TEMPLATE

diff --git a/default_images/res/lx03128.png b/default_images/res/lx03128.png
deleted file mode 100644
index 309e882..000
Binary files a/default_images/res/lx03128.png and /dev/null differ
diff --git a/default_images/res/lx03252.png b/default_images/res/lx03252.png
deleted file mode 100644
index 3bd7387..000
Binary files a/default_images/res/lx03252.png and /dev/null differ
diff --git a/default_images/res/otg_16_8.png b/default_images/res/otg_16_8.png
deleted file mode 100644
index 4bb2bfe..000
Binary files a/default_images/res/otg_16_8.png and /dev/null differ
diff --git a/default_images/res/otg_32_8.png b/default_images/res/otg_32_8.png
deleted file mode 100644
index b3c0823..000
Binary files a/default_images/res/otg_32_8.png and /dev/null differ
diff --git a/default_images/res/otg_48_8.png b/default_images/res/otg_48_8.png
deleted file mode 100644
index 7544b6f..000
Binary files a/default_images/res/otg_48_8.png and /dev/null differ
diff --git a/default_images/res/sx03128.png b/default_images/res/sx03128.png
deleted file mode 100644
index a24df73..000
Binary files a/default_images/res/sx03128.png and /dev/null differ
diff --git a/default_images/res/sx03252.png b/default_images/res/sx03252.png
deleted file mode 100644
index 456b810..000
Binary files a/default_images/res/sx03252.png and /dev/null differ
diff --git a/ooo_custom_images/crystal/res/lx03139.png 
b/ooo_custom_images/crystal/res/lx03139.png
deleted file mode 100644
index 4113176..000
Binary files a/ooo_custom_images/crystal/res/lx03139.png and /dev/null differ
diff --git a/ooo_custom_images/crystal/res/sx03139.png 
b/ooo_custom_images/crystal/res/sx03139.png
deleted file mode 100644
index

[Libreoffice-commits] .: dictionaries/he_IL

2011-11-15 Thread Lior Kaplan

 dictionaries/he_IL/alphabet.png|binary
 dictionaries/he_IL/description.xml |3 +++
 2 files changed, 3 insertions(+)

New commits:
commit adcf6d59e7770a08dd156a2168b116b2eeded80c
Author: Lior Kaplan kaplanl...@gmail.com
Date:   Tue Nov 15 20:56:51 2011 +0200

Add an icon

diff --git a/dictionaries/he_IL/alphabet.png b/dictionaries/he_IL/alphabet.png
new file mode 100644
index 000..a65866d
Binary files /dev/null and b/dictionaries/he_IL/alphabet.png differ
diff --git a/dictionaries/he_IL/description.xml 
b/dictionaries/he_IL/description.xml
index 6ce8147..e188dc0 100644
--- a/dictionaries/he_IL/description.xml
+++ b/dictionaries/he_IL/description.xml
@@ -13,4 +13,7 @@
 name xlink:href=http://hspell.ivrix.org.il/; lang=en-USThe Hspell 
Project/name
 name xlink:href=http://hspell.ivrix.org.il/; 
lang=he×¤×¨××××§× Hspell/name
  /publisher
+ icon
+default xlink:href=alphabet.png /
+ /icon
 /description
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/source

2011-11-15 Thread Kohei Yoshida

 sc/source/ui/dbgui/filtdlg.cxx  |2 +-
 sc/source/ui/dbgui/sfiltdlg.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e3e77167ad7c0263c124b6327728502b411cebb3
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Tue Nov 15 13:57:24 2011 -0500

Fixed the ref button for copy results to not starting the ref mode.

diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx
index daffd24..5b34f82 100644
--- a/sc/source/ui/dbgui/filtdlg.cxx
+++ b/sc/source/ui/dbgui/filtdlg.cxx
@@ -112,7 +112,7 @@ ScFilterDlg::ScFilterDlg( SfxBindings* pB, SfxChildWindow* 
pCW, Window* pParent,
 aBtnCopyResult  ( this, ScResId( BTN_COPY_RESULT ) ),
 aLbCopyArea ( this, ScResId( LB_COPY_AREA ) ),
 aEdCopyArea ( this, this, ScResId( ED_COPY_AREA ) ),
-aRbCopyArea ( this, ScResId( RB_COPY_AREA ) ),
+aRbCopyArea ( this, ScResId( RB_COPY_AREA ), aEdCopyArea, this ),
 aBtnDestPers( this, ScResId( BTN_DEST_PERS ) ),
 aFtDbAreaLabel  ( this, ScResId( FT_DBAREA_LABEL ) ),
 aFtDbArea   ( this, ScResId( FT_DBAREA ) ),
diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx
index 83d8fde..37d05b6 100644
--- a/sc/source/ui/dbgui/sfiltdlg.cxx
+++ b/sc/source/ui/dbgui/sfiltdlg.cxx
@@ -84,7 +84,7 @@ ScSpecialFilterDlg::ScSpecialFilterDlg( SfxBindings* pB, 
SfxChildWindow* pCW, Wi
 aBtnCopyResult  ( this, ScResId( BTN_COPY_RESULT ) ),
 aLbCopyArea ( this, ScResId( LB_COPY_AREA ) ),
 aEdCopyArea ( this, this, ScResId( ED_COPY_AREA ) ),
-aRbCopyArea ( this, ScResId( RB_COPY_AREA ) ),
+aRbCopyArea ( this, ScResId( RB_COPY_AREA ), aEdCopyArea, this ),
 aBtnDestPers( this, ScResId( BTN_DEST_PERS ) ),
 aFtDbAreaLabel  ( this, ScResId( FT_DBAREA_LABEL ) ),
 aFtDbArea   ( this, ScResId( FT_DBAREA ) ),
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 5 commits - patches/dev300

2011-11-15 Thread Bjoern Michaelsen

 patches/dev300/addrbk-datasrc-ordering.diff   |   34 
 patches/dev300/apply  |   30 
 patches/dev300/gcc-HelpLinker.diff|   37 -
 patches/dev300/odf-converter-ignore-writerfilter.diff |  141 ---
 patches/dev300/office-cfg-linux-common-template-dir.diff  |   41 -
 patches/dev300/oox-pptx-export-update-to-ooo320.diff  |  198 -
 patches/dev300/sfx2-pre-and-postprocess-during-save-load.diff |  355 --
 7 files changed, 1 insertion(+), 835 deletions(-)

New commits:
commit dd851e09a287c75bb894e4b38ea9616e62c7c95a
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Tue Nov 15 20:07:03 2011 +0100

gcc-HelpLinker.diff should be obsolete

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 37ab886..0af2244 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -10,7 +10,7 @@ 
PATCHPATH=.:../vba:../mono:../64bit:../gstreamer:../ooxml:../postgresql
 OLDEST_SUPPORTED=ooo330-m7 ooo-build-3.2.98.0 libreoffice-3.2.99.1
 
 #  Functional sub-sets 
-Common : BuildBits, TemporaryHacks, Fixes, DefaultSettings, Features, Misc, 
CalcFixes, EasterEgg, GnomeVFS, VBAObjects, OOXML, FedoraCommonFixes, 
WriterDocComparison, MySQL
+Common : BuildBits, TemporaryHacks, Fixes, DefaultSettings, Misc, CalcFixes, 
EasterEgg, GnomeVFS, VBAObjects, OOXML, FedoraCommonFixes, WriterDocComparison, 
MySQL
 
 LinuxCommon : Common, LinuxOnly, CliMonoCommon, Mono, MonoComp, Netbook
 MacOSXCommon : Common
@@ -147,9 +147,6 @@ warning-return-values-stlport.diff, jholesov
 # gcc OOMs here otherwise (x86_64)
 writerfilter-qnametostr-NOOPTFILES.diff
 
-# don't let HelpLinker be miscompiled with g++ 4.3
-gcc-HelpLinker.diff # RENAMED transex3 - l10ntools
-
 # included in dev300 for OOo-3.4
 # add the .archive flag to some instsetoo_native/util/makefile.mk rules
 buildfix-instsetoo_native-archive.diff, i#111617
@@ -496,19 +493,6 @@ win32-prebuilt-writingaids-zip-scp2.diff
 # Optimal Page Wrap should be default for graphics insertion (X#59831)
 writer-default-as-optimal-page-wrap.diff, i#38108, jody
 
-[ Features ]
-# ask user on logout/shutdown to save documents
-# It seems to be better not to use this. It interfers with upstream's
-# handling of the issue. See discussion in bnc#525331. --tml
-# session-management.diff, i#63156, rodo
-
-# embed generic media files inside odf docs, plus various related
-# sound fixes from rodo
-#impressmedia-features.diff, i#83753, n#515553, thorsten
-#slideshow-sound.diff, n#515553, rodo
-
-# Pre- and postprocessing capabilities for loading and saving.
-sfx2-pre-and-postprocess-during-save-load.diff, i#71939, flr
 
 [ BuildBits ]
 build-identification.diff, tml
diff --git a/patches/dev300/gcc-HelpLinker.diff 
b/patches/dev300/gcc-HelpLinker.diff
deleted file mode 100644
index 3266a6d..000
--- a/patches/dev300/gcc-HelpLinker.diff
+++ /dev/null
@@ -1,37 +0,0 @@
-From e038b9fdc8a8f997d6e85e2194911bb5b742fbe3 Mon Sep 17 00:00:00 2001
-From: Jan Holesovsky ke...@suse.cz
-Date: Fri, 14 May 2010 16:53:24 +0200
-Subject: [PATCH 051/878] gcc-HelpLinker.diff
-

- transex3/source/help/makefile.mk |1 +
- transex3/source/makefile.mk  |1 +
- 2 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/transex3/source/help/makefile.mk 
b/transex3/source/help/makefile.mk
-index 3196d23..2841da2 100644
 l10ntools/source/help/makefile.mk
-+++ l10ntools/source/help/makefile.mk
-@@ -36,6 +36,7 @@ TARGETTYPE=CUI
- 
- .INCLUDE : settings.mk
- .INCLUDE : helplinker.pmk
-+CDEFS+= -O0
-  
- .IF $(SYSTEM_LIBXSLT) == YES
- CFLAGS+= $(LIBXSLT_CFLAGS)
-diff --git a/transex3/source/makefile.mk b/transex3/source/makefile.mk
-index ab54779..e08e0ac 100644
 l10ntools/source/makefile.mk
-+++ l10ntools/source/makefile.mk
-@@ -39,6 +39,7 @@ ENABLE_EXCEPTIONS=TRUE
- .INCLUDE :  settings.mk
- CDEFS+= -DYY_NEVER_INTERACTIVE=1
- #CDEFS+= -pg
-+CDEFS+= -O0
- 
- .IF $(SYSTEM_EXPAT) == YES
- CFLAGS+=-DSYSTEM_EXPAT
--- 
-1.7.0.1
-
diff --git a/patches/dev300/sfx2-pre-and-postprocess-during-save-load.diff 
b/patches/dev300/sfx2-pre-and-postprocess-during-save-load.diff
deleted file mode 100644
index a3c6d27..000
--- a/patches/dev300/sfx2-pre-and-postprocess-during-save-load.diff
+++ /dev/null
@@ -1,355 +0,0 @@

- package/source/xstor/xstorage.cxx |8 +-
- sfx2/source/doc/objstor.cxx   |  257 -
- 2 files changed, 251 insertions(+), 14 deletions(-)
-
-diff --git package/source/xstor/xstorage.cxx package/source/xstor/xstorage.cxx
-index c6cc37f..848c7c6 100644
 package/source/xstor/xstorage.cxx
-+++ package/source/xstor/xstorage.cxx
-@@ -4458,13 +4458,7 @@ sal_Bool SAL_CALL OStorage::hasByName( const 
::rtl::OUString aName )
- catch ( uno::Exception aException )
- {
-m_pImpl-AddLog( aException.Message );
--   m_pImpl-AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
OSL_LOG_PREFIX

[Libreoffice-commits] .: sc/source

2011-11-15 Thread Kohei Yoshida

 sc/source/ui/dbgui/filtdlg.cxx |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 7ef63de9952484b8f43f11cdb97e16ca015e522c
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Tue Nov 15 14:20:11 2011 -0500

Parse it as a single address.

We ensure in SetReference() that the reference is always a single
address.

diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx
index 5b34f82..4c527ba 100644
--- a/sc/source/ui/dbgui/filtdlg.cxx
+++ b/sc/source/ui/dbgui/filtdlg.cxx
@@ -676,10 +676,9 @@ ScQueryItem* ScFilterDlg::GetOutputItem()
 
 if ( aBtnCopyResult.IsChecked() )
 {
-ScRange aTempRange;
-sal_uInt16 nResult = aTempRange.Parse(aEdCopyArea.GetText(), pDoc, 
pDoc-GetAddressConvention());
+sal_uInt16 nResult = theCopyPos.Parse(
+aEdCopyArea.GetText(), pDoc, pDoc-GetAddressConvention());
 bCopyPosOk = ( SCA_VALID == (nResult  SCA_VALID) );
-theCopyPos = aTempRange.aStart;
 }
 
 if ( aBtnCopyResult.IsChecked()  bCopyPosOk )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 8 commits - .gitignore connectivity/source cppu/qa cppuhelper/qa libcmis/libcmis-0.1.0.patch libexttextcat/libexttextcat-3.2.0-visibility.patch libexttextcat/makefile.mk lingu

2011-11-15 Thread Michael Stahl

 .gitignore|1 
 connectivity/source/drivers/mozab/makefile.mk |4 -
 connectivity/source/drivers/mozab/mozabdrv.map|8 ---
 connectivity/source/drivers/odbcbase/OConnection.cxx  |1 
 cppu/qa/cppumaker/makefile.mk |3 -
 cppu/qa/cppumaker/version.map |   34 --
 cppu/qa/makefile.mk   |9 ++-
 cppu/qa/version.map   |   34 --
 cppuhelper/qa/ifcontainer/export.map  |7 --
 cppuhelper/qa/ifcontainer/makefile.mk |3 -
 cppuhelper/qa/unourl/export.map   |7 --
 cppuhelper/qa/unourl/makefile.mk  |3 -
 libcmis/libcmis-0.1.0.patch   |3 -
 libexttextcat/libexttextcat-3.2.0-visibility.patch|   10 
 libexttextcat/makefile.mk |4 +
 lingucomponent/source/languageguessing/makefile.mk|5 --
 sdext/source/pdfimport/makefile.mk|3 -
 sdext/source/pdfimport/services.cxx   |3 -
 sdext/source/presenter/PresenterComponent.cxx |5 --
 sdext/source/presenter/makefile.mk|3 -
 shell/source/all/makefile.mk  |1 
 shell/source/unix/sysshell/makefile.mk|3 -
 shell/source/unix/sysshell/recently_used_file_handler.cxx |4 +
 shell/source/unix/sysshell/recfile.map|6 --
 testtools/source/bridgetest/makefile.mk   |5 +-
 ucb/source/ucp/cmis/makefile.mk   |3 -
 26 files changed, 50 insertions(+), 122 deletions(-)

New commits:
commit 1fb5eb2162d79a44f5bb90627c1ca340d1322129
Author: Michael Stahl mst...@redhat.com
Date:   Tue Nov 15 16:00:49 2011 +0100

fdo#42865: sdext: no mapfile

In order to not have the offending local _ZNSs4_Rep20_S_empty_rep_storageE
symbol in PresenterScreen.uno.so and pdfimport.uno.so,
build them with hidden visibility.

diff --git a/sdext/source/pdfimport/makefile.mk 
b/sdext/source/pdfimport/makefile.mk
index 8e0dfa0..64fc1af 100644
--- a/sdext/source/pdfimport/makefile.mk
+++ b/sdext/source/pdfimport/makefile.mk
@@ -30,6 +30,7 @@ PRJ=..$/..
 PRJNAME=sdext
 TARGET=pdfimport
 ENABLE_EXCEPTIONS=TRUE
+VISIBILITY_HIDDEN=TRUE
 
 # --- Settings -
 
@@ -90,7 +91,7 @@ SHL1STDLIBS=\
 SHL1DEPN=
 SHL1IMPLIB=i$(SHL1TARGET)
 SHL1DEF=   $(MISC)$/$(SHL1TARGET).def
-SHL1VERSIONMAP=$(SOLARENV)/src/reg-component.map
+SHL1USE_EXPORTS = name
 SHL1RPATH=OXT
 
 DEF1NAME=$(SHL1TARGET)
diff --git a/sdext/source/pdfimport/services.cxx 
b/sdext/source/pdfimport/services.cxx
index b158e44..c2c0270 100644
--- a/sdext/source/pdfimport/services.cxx
+++ b/sdext/source/pdfimport/services.cxx
@@ -121,7 +121,8 @@ namespace
 }
 }
 
-extern C sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, 
void* pRegistryKey )
+extern C SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL
+component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey )
 {
 Reference XRegistryKey  xRootKey( static_cast XRegistryKey* ( 
pRegistryKey ) );
 
diff --git a/sdext/source/presenter/PresenterComponent.cxx 
b/sdext/source/presenter/PresenterComponent.cxx
index d59a5b5..f40052b 100644
--- a/sdext/source/presenter/PresenterComponent.cxx
+++ b/sdext/source/presenter/PresenterComponent.cxx
@@ -119,15 +119,12 @@ extern C
 return g_moduleCount.canUnload( g_moduleCount , pTime );
 }
 
-sal_Bool SAL_CALL component_writeInfo(
+SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
 void * pServiceManager, void * pRegistryKey )
 {
 return component_writeInfoHelper(pServiceManager, pRegistryKey, 
gServiceEntries);
 }
 
-
-
-
 SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
 const sal_Char * pImplName, void * pServiceManager, void * 
pRegistryKey )
 {
diff --git a/sdext/source/presenter/makefile.mk 
b/sdext/source/presenter/makefile.mk
index 9ced62e..a085439 100644
--- a/sdext/source/presenter/makefile.mk
+++ b/sdext/source/presenter/makefile.mk
@@ -32,6 +32,7 @@ GEN_HID=FALSE
 EXTNAME=PresenterScreen
 
 ENABLE_EXCEPTIONS=TRUE
+VISIBILITY_HIDDEN=TRUE
 # survive zip dependencies
 MAXLINELENGTH:=10
 
@@ -108,7 +109,7 @@ SHL1DEPN=
 SHL1IMPLIB=i$(SHL1TARGET)
 SHL1LIBS=  $(SLB)$/$(TARGET).lib
 SHL1DEF=   $(MISC)$/$(SHL1TARGET).def
-SHL1VERSIONMAP=$(SOLARENV)/src/reg-component.map
+SHL1USE_EXPORTS = name
 SHL1RPATH=  OXT
 DEF1NAME=  $(SHL1TARGET)
 
commit 48dbaa517f1a72a9bf11fa4db7425510c86c677b
Author: Michael Stahl mst...@redhat.com
Date:   Tue Nov 15 15:58:10 2011 +0100

fdo#42865: connectivity: mozab: no mapfile

[Libreoffice-commits] .: sc/inc sc/source

2011-11-15 Thread Kohei Yoshida

 sc/inc/cell.hxx   |4 ++--
 sc/source/core/data/cell2.cxx |   10 ++
 2 files changed, 12 insertions(+), 2 deletions(-)

New commits:
commit 87be97a31d8686e3e6e976bb5585b32c096ca19d
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Tue Nov 15 15:20:13 2011 -0500

Make these two methods non-inline.

diff --git a/sc/inc/cell.hxx b/sc/inc/cell.hxx
index 875e7da..58a16b8 100644
--- a/sc/inc/cell.hxx
+++ b/sc/inc/cell.hxx
@@ -458,8 +458,8 @@ public:
 voidFindRangeNamesInUse(std::setsal_uInt16 rIndexes) const;
 voidReplaceRangeNamesInUse( const ScRangeData::IndexMap rMap 
);
 boolIsSubTotal() const  { return 
bSubTotal; }
-boolIsChanged() const   { return bChanged; 
}
-voidResetChanged()  { bChanged = 
false; }
+boolIsChanged() const;
+voidResetChanged();
 boolIsEmpty();  // formula::svEmptyCell result
 // display as empty string if formula::svEmptyCell result
 boolIsEmptyDisplayedAsString();
diff --git a/sc/source/core/data/cell2.cxx b/sc/source/core/data/cell2.cxx
index 9733c8a..d23940c 100644
--- a/sc/source/core/data/cell2.cxx
+++ b/sc/source/core/data/cell2.cxx
@@ -1603,6 +1603,16 @@ void ScFormulaCell::ReplaceRangeNamesInUse( const 
ScRangeData::IndexMap rMap )
 CompileTokenArray();
 }
 
+bool ScFormulaCell::IsChanged() const
+{
+return bChanged;
+}
+
+void ScFormulaCell::ResetChanged()
+{
+bChanged = false;
+}
+
 void ScFormulaCell::CompileDBFormula()
 {
 for( FormulaToken* p = pCode-First(); p; p = pCode-Next() )
___
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

2011-11-15 Thread Kohei Yoshida

 sc/inc/document.hxx  |2 
 sc/source/core/data/documen2.cxx |1 
 sc/source/core/data/documen8.cxx |2 
 sc/source/core/data/document.cxx |   16 +---
 sc/source/core/tool/addinlis.cxx |1 
 sc/source/core/tool/adiasync.cxx |1 
 sc/source/ui/docshell/docsh3.cxx |5 -
 sc/source/ui/view/gridwin4.cxx   |3 
 sc/source/ui/view/tabview3.cxx   |  152 +++
 9 files changed, 86 insertions(+), 97 deletions(-)

New commits:
commit 3b1e88a8eb6b3f9da7c899a791e491db21d1bbdc
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Tue Nov 15 16:55:49 2011 -0500

Reset formula cell's changed flag only for those within visible range.

Especially avoid marking all cells in all sheets which would cause a
performance problem.

diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index de903d0..02cc60d 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -864,7 +864,7 @@ public:
 const ::editeng::SvxBorderLine** ppRight,
 const ::editeng::SvxBorderLine** ppBottom 
) const;
 
-voidResetChanged( const ScRangeList rRanges );
+voidResetChanged( const ScRange rRange );
 
 voidSetDirty();
 voidSetDirty( const ScRange );
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index 223c505..5798f4d 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -336,7 +336,6 @@ IMPL_LINK( ScDocument, TrackTimeHdl, Timer*, EMPTYARG )
 {
 TrackFormulas();
 pShell-Broadcast( SfxSimpleHint( FID_DATACHANGED ) );
-ResetChanged( ScRange(0,0,0,MAXCOL,MAXROW,MAXTAB) );
 
 //  modified...
 
diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx
index 914cfef..1a439a7 100644
--- a/sc/source/core/data/documen8.cxx
+++ b/sc/source/core/data/documen8.cxx
@@ -1056,7 +1056,6 @@ void ScDocument::UpdateExternalRefLinks(Window* pWin)
 {
 TrackFormulas();
 pShell-Broadcast( SfxSimpleHint(FID_DATACHANGED) );
-ResetChanged( ScRange(0, 0, 0, MAXCOL, MAXROW, MAXTAB) );
 
 // #i101960# set document modified, as in TrackTimeHdl for DDE links
 if (!pShell-IsModified())
@@ -1117,7 +1116,6 @@ void ScDocument::UpdateDdeLinks(Window* pWin)
 //  Formeln berechnen und painten wie im TrackTimeHdl
 TrackFormulas();
 pShell-Broadcast( SfxSimpleHint( FID_DATACHANGED ) );
-ResetChanged( ScRange(0,0,0,MAXCOL,MAXROW,MAXTAB) );
 
 //  wenn FID_DATACHANGED irgendwann mal asynchron werden sollte
 //  (z.B. mit Invalidate am Window), muss hier ein Update 
erzwungen werden.
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 9f44829..40e85d7 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -3504,18 +3504,14 @@ sal_uInt16 ScDocument::GetErrCode( const ScAddress 
rPos ) const
 }
 
 
-void ScDocument::ResetChanged( const ScRangeList rRanges )
+void ScDocument::ResetChanged( const ScRange rRange )
 {
 SCTAB nTabSize = static_castSCTAB(maTabs.size());
-for (size_t i = 0, n = rRanges.size(); i  n; ++i)
-{
-const ScRange rRange = *rRanges[i];
-SCTAB nTab1 = rRange.aStart.Tab();
-SCTAB nTab2 = rRange.aEnd.Tab();
-for (SCTAB nTab = nTab1; nTab1 = nTab2  nTab  nTabSize; ++nTab)
-if (maTabs[nTab])
-maTabs[nTab]-ResetChanged(rRange);
-}
+SCTAB nTab1 = rRange.aStart.Tab();
+SCTAB nTab2 = rRange.aEnd.Tab();
+for (SCTAB nTab = nTab1; nTab1 = nTab2  nTab  nTabSize; ++nTab)
+if (maTabs[nTab])
+maTabs[nTab]-ResetChanged(rRange);
 }
 
 //
diff --git a/sc/source/core/tool/addinlis.cxx b/sc/source/core/tool/addinlis.cxx
index 267d006..292824a 100644
--- a/sc/source/core/tool/addinlis.cxx
+++ b/sc/source/core/tool/addinlis.cxx
@@ -135,7 +135,6 @@ void SAL_CALL ScAddInListener::modified( const 
::com::sun::star::sheet::ResultEv
 ScDocument* pDoc = (ScDocument*)*ppDoc;
 pDoc-TrackFormulas();
 pDoc-GetDocumentShell()-Broadcast( SfxSimpleHint( FID_DATACHANGED ) 
);
-pDoc-ResetChanged( ScRange(0,0,0,MAXCOL,MAXROW,MAXTAB) );
 }
 }
 
diff --git a/sc/source/core/tool/adiasync.cxx b/sc/source/core/tool/adiasync.cxx
index 341aee1..208305f 100644
--- a/sc/source/core/tool/adiasync.cxx
+++ b/sc/source/core/tool/adiasync.cxx
@@ -151,7 +151,6 @@ void ScAddInAsync::CallBack( sal_uLong nHandleP, void* 
pData )
 ScDocument* pDoc = (ScDocument*)*ppDoc;
 pDoc-TrackFormulas();
 pDoc-GetDocumentShell()-Broadcast( SfxSimpleHint( FID_DATACHANGED ) 
);
-pDoc-ResetChanged( ScRange(0,0,0,MAXCOL,MAXROW,MAXTAB) );
 }
 }
 
diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx
index b392c2d..b7a139f

[Libreoffice-commits] .: sc/source

2011-11-15 Thread Kohei Yoshida

 sc/source/core/data/document.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ed950587b463d1c6da647f9ff8dea97f6987c54a
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Tue Nov 15 17:28:14 2011 -0500

Fixed hard re-calc.  Manual re-calc still not working yet.

diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 40e85d7..de225f4 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -3411,7 +3411,7 @@ void ScDocument::CalcAll()
 for (; it != maTabs.end(); ++it)
 if (*it)
 (*it)-SetDirtyVar();
-for (; it != maTabs.end(); ++it)
+for (it = maTabs.begin(); it != maTabs.end(); ++it)
 if (*it)
 (*it)-CalcAll();
 ClearFormulaTree();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/source

2011-11-15 Thread Kohei Yoshida

 sc/source/ui/docshell/docsh4.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8f87c3d7d5a7142d22429e66c8953852e9c1e580
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Tue Nov 15 20:39:54 2011 -0500

Fixed soft re-calc.

diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index cb30e00..ae426a1 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -1240,7 +1240,7 @@ void ScDocShell::DoRecalc( sal_Bool bApi )
 if (!bDone) // sonst Dokument neu berechnen
 {
 WaitObject aWaitObj( GetActiveDialogParent() );
-aDocument.CalcFormulaTree( sal_True );
+aDocument.CalcFormulaTree();
 if ( pSh )
 pSh-UpdateCharts(sal_True);
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - sc/source

2011-11-15 Thread Kohei Yoshida

 sc/source/ui/docshell/docsh.cxx  |   15 +++---
 sc/source/ui/docshell/docsh2.cxx |4 +-
 sc/source/ui/docshell/docsh4.cxx |   33 ++
 sc/source/ui/docshell/docsh6.cxx |2 -
 sc/source/ui/docshell/docsh8.cxx |   16 +-
 sc/source/ui/inc/docsh.hxx   |   57 +--
 6 files changed, 58 insertions(+), 69 deletions(-)

New commits:
commit 7ba7cbae11b8850b56edd638894554883c5d3b08
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Tue Nov 15 21:09:53 2011 -0500

Cleaned up ScDocShell a bit.

diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 8f4d96d..fd4efe4 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -1036,8 +1036,6 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium rMedium )
 
 vectorScDocRowHeightUpdater::TabRanges aRecalcRowRangesArray;
 
-aConvFilterName.Erase(); //@ #BugId 54198
-
 //  Alle Filter brauchen die komplette Datei am Stueck (nicht asynchron),
 //  darum vorher per CreateFileStream dafuer sorgen, dass die komplette
 //  Datei uebertragen wird.
@@ -1051,8 +1049,6 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium rMedium )
 {
 String aFltName = pFilter-GetFilterName();
 
-aConvFilterName=aFltName; //@ #BugId 54198
-
 sal_Bool bCalc3 = ( aFltName.EqualsAscii(pFilterSc30) );
 sal_Bool bCalc4 = ( aFltName.EqualsAscii(pFilterSc40) );
 if (!bCalc3  !bCalc4)
@@ -2500,15 +2496,14 @@ sal_Bool ScDocShell::HasAutomaticTableName( const 
String rFilter )
 
aDdeTextFmt(String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(TEXT))), \
 nPrtToScreenFactor( 1.0 ), \
 pImpl   ( new DocShell_Impl ), \
-bHeaderOn   ( sal_True ), \
-bFooterOn   ( sal_True ), \
-bNoInformLost   ( sal_True ), \
-bIsEmpty( sal_True ), \
+bHeaderOn   ( true ), \
+bFooterOn   ( true ), \
+bIsEmpty( true ), \
 bIsInUndo   ( false ), \
 bDocumentModifiedPending( false ), \
+bUpdateEnabled  ( true ), \
 nDocumentLock   ( 0 ), \
 nCanUpdate 
(com::sun::star::document::UpdateDocMode::ACCORDING_TO_CONFIG), \
-bUpdateEnabled  ( sal_True ), \
 pOldAutoDBRange ( NULL ), \
 pDocHelper  ( NULL ), \
 pAutoStyleList  ( NULL ), \
@@ -2726,7 +2721,7 @@ void ScDocShell::SetDrawModified( sal_Bool bIsModified /* 
= sal_True */ )
 }
 }
 
-void ScDocShell::SetInUndo(sal_Bool bSet)
+void ScDocShell::SetInUndo(bool bSet)
 {
 bIsInUndo = bSet;
 }
diff --git a/sc/source/ui/docshell/docsh2.cxx b/sc/source/ui/docshell/docsh2.cxx
index b3ccd39..da261db 100644
--- a/sc/source/ui/docshell/docsh2.cxx
+++ b/sc/source/ui/docshell/docsh2.cxx
@@ -104,13 +104,13 @@ sal_Bool ScDocShell::InitNew( const uno::Reference  
embed::XStorage  xStor )
 
 //--
 
-sal_Bool ScDocShell::IsEmpty() const
+bool ScDocShell::IsEmpty() const
 {
 return bIsEmpty;
 }
 
 
-void ScDocShell::SetEmpty(sal_Bool bSet)
+void ScDocShell::SetEmpty(bool bSet)
 {
 bIsEmpty = bSet;
 }
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index 4b79ecd..8bd4782 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -1153,15 +1153,15 @@ void UpdateAcceptChangesDialog()
 
 //--
 
-sal_Bool ScDocShell::ExecuteChangeProtectionDialog( Window* _pParent, sal_Bool 
bJustQueryIfProtected )
+bool ScDocShell::ExecuteChangeProtectionDialog( Window* _pParent, sal_Bool 
bJustQueryIfProtected )
 {
-sal_Bool bDone = false;
+bool bDone = false;
 ScChangeTrack* pChangeTrack = aDocument.GetChangeTrack();
 if ( pChangeTrack )
 {
 sal_Bool bProtected = pChangeTrack-IsProtected();
 if ( bJustQueryIfProtected  !bProtected )
-return sal_True;
+return true;
 
 String aTitle( ScResId( bProtected ? SCSTR_CHG_UNPROTECT : 
SCSTR_CHG_PROTECT ) );
 String aText( ScResId( SCSTR_PASSWORD ) );
@@ -1186,7 +1186,7 @@ sal_Bool ScDocShell::ExecuteChangeProtectionDialog( 
Window* _pParent, sal_Bool b
 if ( 
SvPasswordHelper::CompareHashPassword(pChangeTrack-GetProtection(), aPassword) 
)
 {
 if ( bJustQueryIfProtected )
-bDone = sal_True;
+bDone = true;
 else
 pChangeTrack-SetProtection(
 com::sun::star::uno::Sequence sal_Int8  (0) );
@@ -1207,12 +1207,12 @@ sal_Bool ScDocShell::ExecuteChangeProtectionDialog( 
Window* _pParent, sal_Bool b
 if ( bProtected != pChangeTrack-IsProtected() )
 {
 UpdateAcceptChangesDialog();
-bDone = sal_True;
+

[Libreoffice-commits] .: sc/source

2011-11-15 Thread Kohei Yoshida

 sc/source/ui/docshell/docsh.cxx |   82 ++--
 1 file changed, 47 insertions(+), 35 deletions(-)

New commits:
commit d8bb96e54339133a708eaa82b37730f793680497
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Tue Nov 15 21:27:29 2011 -0500

Let's not use macro for this sort of stuff.

diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index fd4efe4..c5e6002 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -2489,38 +2489,31 @@ sal_Bool ScDocShell::HasAutomaticTableName( const 
String rFilter )
 || rFilter.EqualsAscii( pFilterRtf );
 }
 
-//==
-
-#define __SCDOCSHELL_INIT \
-aDocument   ( SCDOCMODE_DOCUMENT, this ), \
-
aDdeTextFmt(String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(TEXT))), \
-nPrtToScreenFactor( 1.0 ), \
-pImpl   ( new DocShell_Impl ), \
-bHeaderOn   ( true ), \
-bFooterOn   ( true ), \
-bIsEmpty( true ), \
-bIsInUndo   ( false ), \
-bDocumentModifiedPending( false ), \
-bUpdateEnabled  ( true ), \
-nDocumentLock   ( 0 ), \
-nCanUpdate 
(com::sun::star::document::UpdateDocMode::ACCORDING_TO_CONFIG), \
-pOldAutoDBRange ( NULL ), \
-pDocHelper  ( NULL ), \
-pAutoStyleList  ( NULL ), \
-pPaintLockData  ( NULL ), \
-pOldJobSetup( NULL ), \
-pSolverSaveData ( NULL ), \
-pSheetSaveData  ( NULL ), \
-pModificator( NULL )
-
-//--
-
-ScDocShell::ScDocShell( const ScDocShell rShell )
-:   SvRefBase(),
-SotObject(),
-SfxObjectShell( rShell.GetCreateMode() ),
-SfxListener(),
-__SCDOCSHELL_INIT
+ScDocShell::ScDocShell( const ScDocShell rShell ) :
+SvRefBase(),
+SotObject(),
+SfxObjectShell( rShell.GetCreateMode() ),
+SfxListener(),
+aDocument   ( SCDOCMODE_DOCUMENT, this ),
+aDdeTextFmt(String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(TEXT))),
+nPrtToScreenFactor( 1.0 ),
+pImpl   ( new DocShell_Impl ),
+bHeaderOn   ( true ),
+bFooterOn   ( true ),
+bIsEmpty( true ),
+bIsInUndo   ( false ),
+bDocumentModifiedPending( false ),
+bUpdateEnabled  ( true ),
+nDocumentLock   ( 0 ),
+nCanUpdate (com::sun::star::document::UpdateDocMode::ACCORDING_TO_CONFIG),
+pOldAutoDBRange ( NULL ),
+pDocHelper  ( NULL ),
+pAutoStyleList  ( NULL ),
+pPaintLockData  ( NULL ),
+pOldJobSetup( NULL ),
+pSolverSaveData ( NULL ),
+pSheetSaveData  ( NULL ),
+pModificator( NULL )
 {
 RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, sc, nn93723, 
ScDocShell::ScDocShell );
 
@@ -2546,9 +2539,28 @@ ScDocShell::ScDocShell( const ScDocShell rShell )
 
 //--
 
-ScDocShell::ScDocShell( const sal_uInt64 i_nSfxCreationFlags )
-:   SfxObjectShell( i_nSfxCreationFlags )
-,   __SCDOCSHELL_INIT
+ScDocShell::ScDocShell( const sal_uInt64 i_nSfxCreationFlags ) :
+SfxObjectShell( i_nSfxCreationFlags ),
+aDocument   ( SCDOCMODE_DOCUMENT, this ),
+aDdeTextFmt(String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(TEXT))),
+nPrtToScreenFactor( 1.0 ),
+pImpl   ( new DocShell_Impl ),
+bHeaderOn   ( true ),
+bFooterOn   ( true ),
+bIsEmpty( true ),
+bIsInUndo   ( false ),
+bDocumentModifiedPending( false ),
+bUpdateEnabled  ( true ),
+nDocumentLock   ( 0 ),
+nCanUpdate (com::sun::star::document::UpdateDocMode::ACCORDING_TO_CONFIG),
+pOldAutoDBRange ( NULL ),
+pDocHelper  ( NULL ),
+pAutoStyleList  ( NULL ),
+pPaintLockData  ( NULL ),
+pOldJobSetup( NULL ),
+pSolverSaveData ( NULL ),
+pSheetSaveData  ( NULL ),
+pModificator( NULL )
 {
 RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, sc, nn93723, 
ScDocShell::ScDocShell );
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/source

2011-11-15 Thread Kohei Yoshida

 sc/source/ui/docshell/docsh.cxx |   12 
 sc/source/ui/inc/docsh.hxx  |1 -
 2 files changed, 13 deletions(-)

New commits:
commit 7d1cfb451bca265ff7ea5e08a9b23b7fdd25e9e2
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Tue Nov 15 21:43:57 2011 -0500

Unused method.

diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index c5e6002..d6c8f6f 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -2971,18 +2971,6 @@ void ScDocShellModificator::SetDocumentModified()
 }
 }
 
-sal_Bool ScDocShell::AcceptStateUpdate() const
-{
-if( SfxObjectShell::AcceptStateUpdate() )
-return sal_True;
-
-if( SC_MOD()-Find1RefWindow( SFX_APP()-GetTopWindow() ) )
-return sal_True;
-
-return false;
-}
-
-
 bool ScDocShell::IsChangeRecording() const
 {
 ScChangeTrack* pChangeTrack = aDocument.GetChangeTrack();
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index f106229..fb23c04 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -420,7 +420,6 @@ public:
 
 const ScOptSolverSave* GetSolverSaveData() const{ return 
pSolverSaveData; } // may be null
 voidSetSolverSaveData( const ScOptSolverSave rData );
-sal_BoolAcceptStateUpdate() const;
 ScSheetSaveData* GetSheetSaveData();
 
 void ResetKeyBindings( ScOptionsUtil::KeyBindingType eType );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - sc/source

[Libreoffice-commits] .: sc/qa solenv/gbuild

[Libreoffice-commits] .: sc/source

[Libreoffice-commits] .: git-hooks/commit-msg

[Libreoffice-commits] .: sc/source

[Libreoffice-commits] .: instsetoo_native/inc_openoffice

[Libreoffice-commits] .: set_soenv.in

[Libreoffice-commits] .: scp2/source

[Libreoffice-commits] .: editeng/source sw/source

[Libreoffice-commits] .: 2 commits - configure.in desktop/unx

[Libreoffice-commits] .: basebmp/inc basebmp/test

[Libreoffice-commits] .: 2 commits - default_images/res ooo_custom_images/crystal ooo_custom_images/hicontrast ooo_custom_images/human ooo_custom_images/industrial ooo_custom_images/oxygen ooo_custom_

[Libreoffice-commits] .: default_images/starmath extras/source starmath/inc starmath/source testautomation/framework testautomation/global testautomation/math

[Libreoffice-commits] .: sc/source

[Libreoffice-commits] .: oox/source

[Libreoffice-commits] .: dbaccess/source

[Libreoffice-commits] .: sw/source

[Libreoffice-commits] .: 3 commits - default_images/res ooo_custom_images/crystal ooo_custom_images/hicontrast ooo_custom_images/human ooo_custom_images/industrial ooo_custom_images/oxygen ooo_custom_

[Libreoffice-commits] .: dictionaries/he_IL

[Libreoffice-commits] .: sc/source

[Libreoffice-commits] .: 5 commits - patches/dev300

[Libreoffice-commits] .: sc/source

[Libreoffice-commits] .: 8 commits - .gitignore connectivity/source cppu/qa cppuhelper/qa libcmis/libcmis-0.1.0.patch libexttextcat/libexttextcat-3.2.0-visibility.patch libexttextcat/makefile.mk lingu

[Libreoffice-commits] .: sc/inc sc/source

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

[Libreoffice-commits] .: sc/source

[Libreoffice-commits] .: sc/source

[Libreoffice-commits] .: 2 commits - sc/source

[Libreoffice-commits] .: sc/source

[Libreoffice-commits] .: sc/source

30 matches

Site Navigation

Mail list logo

Footer information