[Libreoffice-commits] .: Branch 'libreoffice-3-5' - extensions/source
extensions/source/bibliography/bibload.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 285b3a4fe0b5b21abe061dfb664800b7e537471e
Author: Caolán McNamara caol...@redhat.com
Date: Fri Mar 9 14:09:30 2012 +
Fix tools-bibliography database, brown paper bag over head commit :-)
(cherry picked from commit bd1088567bafa6293ffecf5331a9016b6d0438e3)
Signed-off-by: Miklos Vajna vmik...@suse.cz
diff --git a/extensions/source/bibliography/bibload.cxx
b/extensions/source/bibliography/bibload.cxx
index 9159124..8b581fd 100644
--- a/extensions/source/bibliography/bibload.cxx
+++ b/extensions/source/bibliography/bibload.cxx
@@ -250,7 +250,7 @@ namespace
static bool lcl_isBaseAvailable()
{
Reference XMultiServiceFactory xMgr =
comphelper::getProcessServiceFactory();
-Reference XAggregation xAggregate = Reference XAggregation (
xMgr-createInstance(C2U(com.sun.star.sbd.RowSet)), UNO_QUERY);
+Reference XAggregation xAggregate = Reference XAggregation (
xMgr-createInstance(C2U(com.sun.star.sdbc.RowSet)), UNO_QUERY);
return xAggregate.is();
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - extensions/source
extensions/source/bibliography/bibload.cxx | 17 -
1 file changed, 16 insertions(+), 1 deletion(-)
New commits:
commit 33ef1ffbd15994ec71be99d38c0d5171c63344a2
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Tue Mar 6 18:16:35 2012 +0100
lp#527938, debian#602953, fdo#33266, i#105408: do not crash on clicking
bibliography when base isnt installed
Signed-off-by: Michael Meeks michael.me...@suse.com
diff --git a/extensions/source/bibliography/bibload.cxx
b/extensions/source/bibliography/bibload.cxx
index c80c81e..9159124 100644
--- a/extensions/source/bibliography/bibload.cxx
+++ b/extensions/source/bibliography/bibload.cxx
@@ -54,6 +54,7 @@
#include com/sun/star/text/BibliographyDataField.hpp
#include com/sun/star/form/XLoadListener.hpp
#include com/sun/star/frame/XLayoutManager.hpp
+#include com/sun/star/uno/XAggregation.hpp
#include toolkit/awt/vclxwindow.hxx
#include vcl/window.hxx
#include vcl/edit.hxx
@@ -243,13 +244,27 @@ void BibliographyLoader::cancel(void) throw
(::com::sun::star::uno::RuntimeExcep
}
// ---
+namespace
+{
+// lp#527938, debian#602953, fdo#33266, i#105408
+static bool lcl_isBaseAvailable()
+{
+Reference XMultiServiceFactory xMgr =
comphelper::getProcessServiceFactory();
+Reference XAggregation xAggregate = Reference XAggregation (
xMgr-createInstance(C2U(com.sun.star.sbd.RowSet)), UNO_QUERY);
+return xAggregate.is();
+}
+}
void BibliographyLoader::load(const Reference XFrame rFrame, const
rtl::OUString rURL,
const Sequence PropertyValue rArgs,
const Reference XLoadEventListener rListener) throw
(::com::sun::star::uno::RuntimeException)
{
-//!
+// lp#527938, debian#602953, fdo#33266, i#105408
+// make sure we actually can instanciate services from base first
+if(!lcl_isBaseAvailable())
+return;
SolarMutexGuard aGuard;
+
m_pBibMod = OpenBibModul();
String aURLStr( rURL );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - extensions/source
extensions/source/nsplugin/source/makefile.mk |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit eaa2186fa15997a22600e06cf3e2cbd79ea4456d Author: Tomáš Chvátal tomas.chva...@gmail.com Date: Wed Feb 22 11:58:54 2012 +0100 fix check for older npapi to work with dmake correctly Signed-off-by: Petr Mladek pmla...@suse.cz diff --git a/extensions/source/nsplugin/source/makefile.mk b/extensions/source/nsplugin/source/makefile.mk index 7d302b5..ef7df8a 100644 --- a/extensions/source/nsplugin/source/makefile.mk +++ b/extensions/source/nsplugin/source/makefile.mk @@ -42,8 +42,8 @@ INCPRE+=$(MOZILLA_HEADERS_CFLAGS) INCPRE=$(SOLARINCDIR)$/npsdk .ENDIF -.IF $(HAVE_NON_CONST_NPP_GETMIMEDESCRIPTION) TRUE -CXXFLAGS += -DHAVE_NON_CONST_NPP_GETMIMEDESCRIPTION=1 +.IF $(HAVE_NON_CONST_NPP_GETMIMEDESCRIPTION) == TRUE +CFLAGS += -DHAVE_NON_CONST_NPP_GETMIMEDESCRIPTION=1 .ENDIF .IF $(GUI)==UNX ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - extensions/source svtools/source
extensions/source/scanner/sanedlg.cxx |6 +++---
svtools/source/filter/sgvtext.cxx | 30 +++---
svtools/source/misc/imap2.cxx |4 ++--
3 files changed, 20 insertions(+), 20 deletions(-)
New commits:
commit e49275751bde6410dcd9f0c543c03f57b068e1cd
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Feb 15 15:26:43 2012 +0100
Fix some apparent misuses of RTL_CONSTASCII_USTRINGPARAM
Signed-off-by: Caolán McNamara caol...@redhat.com
diff --git a/extensions/source/scanner/sanedlg.cxx
b/extensions/source/scanner/sanedlg.cxx
index d08a175..9726f3b 100644
--- a/extensions/source/scanner/sanedlg.cxx
+++ b/extensions/source/scanner/sanedlg.cxx
@@ -1214,18 +1214,18 @@ sal_Bool SaneDlg::LoadState()
using comphelper::string::matchL;
-if (matchL(aValue, RTL_CONSTASCII_USTRINGPARAM(BOOL=)))
+if (matchL(aValue, RTL_CONSTASCII_STRINGPARAM(BOOL=)))
{
aValue = aValue.copy(RTL_CONSTASCII_LENGTH(BOOL=));
sal_Bool aBOOL = (sal_Bool)aValue.toInt32();
mrSane.SetOptionValue( nOption, aBOOL );
}
-else if (matchL(aValue, RTL_CONSTASCII_USTRINGPARAM(STRING=)))
+else if (matchL(aValue, RTL_CONSTASCII_STRINGPARAM(STRING=)))
{
aValue = aValue.copy(RTL_CONSTASCII_LENGTH(STRING=));
mrSane.SetOptionValue(nOption,rtl::OStringToOUString(aValue,
osl_getThreadTextEncoding()) );
}
-else if (matchL(aValue, RTL_CONSTASCII_USTRINGPARAM(NUMERIC=)))
+else if (matchL(aValue, RTL_CONSTASCII_STRINGPARAM(NUMERIC=)))
{
aValue = aValue.copy(RTL_CONSTASCII_LENGTH(NUMERIC=));
diff --git a/svtools/source/filter/sgvtext.cxx
b/svtools/source/filter/sgvtext.cxx
index fbf9864..45b3a23 100644
--- a/svtools/source/filter/sgvtext.cxx
+++ b/svtools/source/filter/sgvtext.cxx
@@ -1193,21 +1193,21 @@ void SgfFontOne::ReadOne( const rtl::OString rID,
ByteString Dsc )
{
s = s.toAsciiUpperCase();
using comphelper::string::matchL;
-if (matchL(s, RTL_CONSTASCII_USTRINGPARAM(BOLD)))
Bold=sal_True;
-else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM(ITAL)))
Ital=sal_True;
-else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM(SERF)))
Serf=sal_True;
-else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM(SANS)))
Sans=sal_True;
-else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM(FIXD)))
Fixd=sal_True;
-else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM(ROMAN)))
SVFamil=FAMILY_ROMAN;
-else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM(SWISS)))
SVFamil=FAMILY_SWISS;
-else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM(MODERN)))
SVFamil=FAMILY_MODERN;
-else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM(SCRIPT)))
SVFamil=FAMILY_SCRIPT;
-else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM(DECORA)))
SVFamil=FAMILY_DECORATIVE;
-else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM(ANSI)))
SVChSet=RTL_TEXTENCODING_MS_1252;
-else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM(IBMPC)))
SVChSet=RTL_TEXTENCODING_IBM_850;
-else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM(MAC)))
SVChSet=RTL_TEXTENCODING_APPLE_ROMAN;
-else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM(SYMBOL)))
SVChSet=RTL_TEXTENCODING_SYMBOL;
-else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM(SYSTEM))) SVChSet
= osl_getThreadTextEncoding();
+if (matchL(s, RTL_CONSTASCII_STRINGPARAM(BOLD)))
Bold=sal_True;
+else if (matchL(s, RTL_CONSTASCII_STRINGPARAM(ITAL)))
Ital=sal_True;
+else if (matchL(s, RTL_CONSTASCII_STRINGPARAM(SERF)))
Serf=sal_True;
+else if (matchL(s, RTL_CONSTASCII_STRINGPARAM(SANS)))
Sans=sal_True;
+else if (matchL(s, RTL_CONSTASCII_STRINGPARAM(FIXD)))
Fixd=sal_True;
+else if (matchL(s, RTL_CONSTASCII_STRINGPARAM(ROMAN)))
SVFamil=FAMILY_ROMAN;
+else if (matchL(s, RTL_CONSTASCII_STRINGPARAM(SWISS)))
SVFamil=FAMILY_SWISS;
+else if (matchL(s, RTL_CONSTASCII_STRINGPARAM(MODERN)))
SVFamil=FAMILY_MODERN;
+else if (matchL(s, RTL_CONSTASCII_STRINGPARAM(SCRIPT)))
SVFamil=FAMILY_SCRIPT;
+else if (matchL(s, RTL_CONSTASCII_STRINGPARAM(DECORA)))
SVFamil=FAMILY_DECORATIVE;
+else if (matchL(s, RTL_CONSTASCII_STRINGPARAM(ANSI)))
SVChSet=RTL_TEXTENCODING_MS_1252;
+else if (matchL(s, RTL_CONSTASCII_STRINGPARAM(IBMPC)))
SVChSet=RTL_TEXTENCODING_IBM_850;
+else if (matchL(s, RTL_CONSTASCII_STRINGPARAM(MAC)))
SVChSet=RTL_TEXTENCODING_APPLE_ROMAN;
+else if (matchL(s, RTL_CONSTASCII_STRINGPARAM(SYMBOL)))
SVChSet=RTL_TEXTENCODING_SYMBOL;
+else if (matchL(s, RTL_CONSTASCII_STRINGPARAM(SYSTEM))) SVChSet
= osl_getThreadTextEncoding();
else
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - extensions/source
extensions/source/abpilot/typeselectionpage.cxx | 12 +---
1 file changed, 5 insertions(+), 7 deletions(-)
New commits:
commit 64c37949a4f07ceb03b9da85a5fae73251abbaf2
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Mon Feb 13 17:36:23 2012 +0100
fdo#43399 hidden radio button should also gets unset
Signed-off-by: Michael Meeks michael.me...@suse.com
diff --git a/extensions/source/abpilot/typeselectionpage.cxx
b/extensions/source/abpilot/typeselectionpage.cxx
index 711159e..aee5219 100644
--- a/extensions/source/abpilot/typeselectionpage.cxx
+++ b/extensions/source/abpilot/typeselectionpage.cxx
@@ -110,9 +110,13 @@ namespace abp
m_aAllTypes.push_back( ButtonItem( m_aOE, AST_OE, bWithMozilla
!bUnx ) );
m_aAllTypes.push_back( ButtonItem( m_aOther, AST_OTHER, true ) );
-bool bFirstVisible = true;
Link aTypeSelectionHandler = LINK(this, TypeSelectionPage,
OnTypeSelected );
const Size aSpacing( LogicToPixel( Size( 0, 3 ), MAP_APPFONT ) );
+if ( ! m_aAllTypes.empty() )
+{
+ButtonItem aItem = m_aAllTypes[0];
+aItem.m_pItem-SetStyle( aItem.m_pItem-GetStyle() | WB_GROUP );
+}
for ( ::std::vector ButtonItem ::const_iterator loop =
m_aAllTypes.begin();
loop != m_aAllTypes.end(); ++loop )
{
@@ -125,12 +129,6 @@ namespace abp
aTopLeft.Y() += aItemSize.Height() + aSpacing.Height();
aItem.m_pItem-SetClickHdl( aTypeSelectionHandler );
aItem.m_pItem-Show();
-
-if ( bFirstVisible )
-{
-aItem.m_pItem-SetStyle( aItem.m_pItem-GetStyle() |
WB_GROUP );
-bFirstVisible = false;
-}
}
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - extensions/source
extensions/source/propctrlr/browserlistbox.cxx | 138 -
extensions/source/propctrlr/browserlistbox.hxx | 23 +---
2 files changed, 73 insertions(+), 88 deletions(-)
New commits:
commit d5d32eb755c8a53292acbf0648fb82baf6729d8a
Author: Jan Holesovsky ke...@suse.cz
Date: Fri Feb 10 14:12:17 2012 +0100
fdo#40261: Fix crash in XML Form Document.
The data structure holding the UI elements in the browser listbox was a
terrible mess - it held the items in an unordered_map, but then accessed
them via a vector containing iterators to this unordered_map.
Fixed the problem (and cleaned all this up) by removing the vector of
iterators, and turning the unordered_map into a normal vector. When we need
access by name, we just go through all the items; it is always just a
handful
of them anyway.
Signed-off-by: Petr Mladek pmla...@suse.cz
diff --git a/extensions/source/propctrlr/browserlistbox.cxx
b/extensions/source/propctrlr/browserlistbox.cxx
index f635ea6..45ef9aa 100644
--- a/extensions/source/propctrlr/browserlistbox.cxx
+++ b/extensions/source/propctrlr/browserlistbox.cxx
@@ -470,7 +470,7 @@ namespace pcr
UpdateVScroll();
-sal_Bool bNeedScrollbar = m_aOrderedLines.size()
(sal_uInt32)CalcVisibleLines();
+sal_Bool bNeedScrollbar = m_aLines.size()
(sal_uInt32)CalcVisibleLines();
if ( !bNeedScrollbar )
{
if ( m_aVScroll.IsVisible() )
@@ -493,7 +493,7 @@ namespace pcr
m_aVScroll.SetPosSizePixel( aVScrollPos, aVScrollSize );
}
-for ( sal_uInt16 i = 0; i m_aOrderedLines.size(); ++i )
+for ( sal_uInt16 i = 0; i m_aLines.size(); ++i )
m_aOutOfDateLines.insert( i );
// repaint
@@ -595,15 +595,16 @@ namespace pcr
aPos.Y() += _nIndex * m_nRowHeight;
-if ( _nIndex m_aOrderedLines.size() )
+if ( _nIndex m_aLines.size() )
{
-m_aOrderedLines[ _nIndex ]-second.pLine-SetPosSizePixel( aPos,
aSize );
+BrowserLinePointer pLine = m_aLines[ _nIndex ].pLine;
-m_aOrderedLines[ _nIndex ]-second.pLine-SetTitleWidth(
m_nTheNameSize + 2 * FRAME_OFFSET );
+pLine-SetPosSizePixel( aPos, aSize );
+pLine-SetTitleWidth( m_nTheNameSize + 2 * FRAME_OFFSET );
// show the line if necessary
-if ( !m_aOrderedLines[ _nIndex ]-second.pLine-IsVisible() )
-m_aOrderedLines[ _nIndex ]-second.pLine-Show();
+if ( !pLine-IsVisible() )
+pLine-Show();
}
}
@@ -615,8 +616,8 @@ namespace pcr
++aLoop
)
{
-DBG_ASSERT( *aLoop m_aOrderedLines.size(),
OBrowserListBox::UpdatePosNSize: invalid line index! );
-if ( *aLoop m_aOrderedLines.size() )
+DBG_ASSERT( *aLoop m_aLines.size(),
OBrowserListBox::UpdatePosNSize: invalid line index! );
+if ( *aLoop m_aLines.size() )
PositionLine( *aLoop );
}
m_aOutOfDateLines.clear();
@@ -629,10 +630,10 @@ namespace pcr
sal_Int32 nLines = CalcVisibleLines();
sal_uInt16 nEnd = (sal_uInt16)(nThumbPos + nLines);
-if (nEnd = m_aOrderedLines.size())
-nEnd = (sal_uInt16)m_aOrderedLines.size()-1;
+if (nEnd = m_aLines.size())
+nEnd = (sal_uInt16)m_aLines.size()-1;
-if ( !m_aOrderedLines.empty() )
+if ( !m_aLines.empty() )
{
for ( sal_uInt16 i = (sal_uInt16)nThumbPos; i = nEnd; ++i )
m_aOutOfDateLines.insert( i );
@@ -662,18 +663,21 @@ namespace pcr
//--
void OBrowserListBox::SetPropertyValue(const ::rtl::OUString _rEntryName,
const Any _rValue, bool _bUnknownValue )
{
-ListBoxLines::iterator line = m_aLines.find( _rEntryName );
+ListBoxLines::iterator line = m_aLines.begin();
+for ( ; line != m_aLines.end() ( line-aName != _rEntryName );
++line )
+;
+
if ( line != m_aLines.end() )
{
if ( _bUnknownValue )
{
-Reference XPropertyControl xControl(
line-second.pLine-getControl() );
+Reference XPropertyControl xControl(
line-pLine-getControl() );
OSL_ENSURE( xControl.is(), OBrowserListBox::SetPropertyValue:
illegal control! );
if ( xControl.is() )
xControl-setValue( Any() );
}
else
-impl_setControlAsPropertyValue( line-second, _rValue );
+impl_setControlAsPropertyValue( *line, _rValue );
}
}
@@ -681,14 +685,14 @@ namespace pcr
sal_uInt16 OBrowserListBox::GetPropertyPos( const ::rtl::OUString
_rEntryName ) const
{
sal_uInt16 nRet = LISTBOX_ENTRY_NOTFOUND;
-for (
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - extensions/source scp2/source
extensions/source/nsplugin/source/makefile.mk |4 scp2/source/ooo/common_brand.scp |2 +- scp2/source/ooo/file_ooo.scp |2 +- scp2/source/ooo/makefile.mk |4 4 files changed, 10 insertions(+), 2 deletions(-) New commits: commit 98bc62b140a2692bef467452f000421e51b9a1f0 Author: Matúš Kukan matus.ku...@gmail.com Date: Fri Jan 13 16:02:03 2012 +0100 make building and installing of nsplugin more consistent diff --git a/extensions/source/nsplugin/source/makefile.mk b/extensions/source/nsplugin/source/makefile.mk index 5b74764..3d52234 100644 --- a/extensions/source/nsplugin/source/makefile.mk +++ b/extensions/source/nsplugin/source/makefile.mk @@ -36,6 +36,8 @@ USE_DEFFILE=TRUE .INCLUDE : settings.mk +.IF $(WITH_MOZILLA) != NO + .IF $(SYSTEM_MOZILLA_HEADERS) == YES INCPRE+=$(MOZILLA_HEADERS_CFLAGS) .ELSE @@ -158,6 +160,8 @@ DEF2EXPORTFILE=exports.dxp DEF2EXPORTFILE=exports_wnt.dxp .ENDIF +.ENDIF # $(WITH_MOZILLA) != NO + # --- Targets -- .INCLUDE : target.mk diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 730de98..474d537 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -642,7 +642,7 @@ File gid_Brand_File_Bin_Libxml2 End #endif -#if !defined WITHOUT_MOZILLA (!defined UNX || defined ENABLE_GTK) +#if !defined WITHOUT_MOZILLA defined ENABLE_NSPLUGIN File gid_Brand_File_Lib_Npsoplugin BIN_FILE_BODY; Name = SPECIAL_NAME(npsoplugin); diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 8e18e8e..091415b 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -110,7 +110,7 @@ End #ifndef WITHOUT_MOZILLA -#if !defined(UNX) || defined(ENABLE_GTK) +#ifdef ENABLE_NSPLUGIN File gid_File_Exe_Nsplugin BIN_FILE_BODY; Styles = (PACKED); diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk index be79403..112eed7 100644 --- a/scp2/source/ooo/makefile.mk +++ b/scp2/source/ooo/makefile.mk @@ -66,6 +66,10 @@ SCPDEFS+=-DENABLE_GTK3 .ENDIF .ENDIF # $(GUI)==UNX +.IF $(ENABLE_NSPLUGIN) == YES +SCPDEFS+=-DENABLE_NSPLUGIN +.ENDIF + .IF $(MERGELIBS) == TRUE SCPDEFS+=-DMERGELIBS .ENDIF ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
