date:20120913

[Libreoffice-commits] .: toolkit/source

2012-09-13 Thread Libreoffice Gerrit user

 toolkit/source/controls/grid/sortablegriddatamodel.cxx |   57 -
 toolkit/source/controls/grid/sortablegriddatamodel.hxx |4 +
 2 files changed, 20 insertions(+), 41 deletions(-)

New commits:
commit 7bfbc9523fd2a6c907cb3ad0b3407ae60c66d358
Author: Frank Schoenheit [fs] 
Date:   Thu Mar 3 13:13:07 2011 +0100

gridfixes: #i117188# remove column sort when rows are inserted

Change-Id: I43b041583c20b47c0fd33a9b5deadffe6fd8f273
Reviewed-on: https://gerrit.libreoffice.org/532
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/toolkit/source/controls/grid/sortablegriddatamodel.cxx 
b/toolkit/source/controls/grid/sortablegriddatamodel.cxx
index fd476e3..ed83013 100644
--- a/toolkit/source/controls/grid/sortablegriddatamodel.cxx
+++ b/toolkit/source/controls/grid/sortablegriddatamodel.cxx
@@ -293,45 +293,15 @@ namespace toolkit
 MethodGuard aGuard( *this, rBHelper );
 DBG_CHECK_ME();
 
-// if the data is not sorted, broadcast the event unchanged
-if ( !impl_isSorted_nothrow() )
-{
-GridDataEvent const aEvent( impl_createPublicEvent( i_event ) );
-impl_broadcast( &XGridDataListener::rowsInserted, aEvent, aGuard );
-return;
-}
-
-bool needReIndex = false;
-if ( i_event.FirstRow > i_event.LastRow )
-{
-OSL_ENSURE( false, "SortableGridDataModel::rowsInserted: invalid 
event - invalid row indexes!" );
-needReIndex = true;
-}
-else if ( size_t( i_event.FirstRow ) > 
m_privateToPublicRowIndex.size() )
+if ( impl_isSorted_nothrow() )
 {
-OSL_ENSURE( false, "SortableGridDataModel::rowsInserted: invalid 
event - too large row index!" );
-needReIndex = true;
-}
-
-if ( needReIndex )
-{
-impl_rebuildIndexesAndNotify( aGuard );
-return;
+// no infrastructure is in place currently to sort the new row to 
its proper location,
+// so we remove the sorting here.
+impl_removeColumnSort( aGuard );
+aGuard.reset();
 }
 
-// we do not insert the new rows into the sort order - if somebody 
adds rows while we're sorted, s/he has
-// to resort. Instead, we simply append the rows, no matter where they 
were inserted in the delegator data
-// model.
-sal_Int32 const nPublicFirstRow = sal_Int32( 
m_privateToPublicRowIndex.size() );
-sal_Int32 nPublicLastRow = nPublicFirstRow;
-for ( sal_Int32 newRow = i_event.FirstRow; newRow <= i_event.LastRow; 
++newRow, ++nPublicLastRow )
-{
-m_privateToPublicRowIndex.push_back( nPublicLastRow );
-m_publicToPrivateRowIndex.push_back( nPublicLastRow );
-}
-
-// broadcast the event
-GridDataEvent const aEvent( *this, -1, -1, nPublicFirstRow, 
nPublicLastRow );
+GridDataEvent const aEvent( impl_createPublicEvent( i_event ) );
 impl_broadcast( &XGridDataListener::rowsInserted, aEvent, aGuard );
 }
 
@@ -568,11 +538,8 @@ namespace toolkit
 }
 
 
//--
-void SAL_CALL SortableGridDataModel::removeColumnSort(  ) throw 
(RuntimeException)
+void SortableGridDataModel::impl_removeColumnSort( MethodGuard& 
i_instanceLock )
 {
-MethodGuard aGuard( *this, rBHelper );
-DBG_CHECK_ME();
-
 lcl_clear( m_publicToPrivateRowIndex );
 lcl_clear( m_privateToPublicRowIndex );
 
@@ -582,11 +549,19 @@ namespace toolkit
 impl_broadcast(
 &XGridDataListener::dataChanged,
 GridDataEvent( *this, -1, -1, -1, -1 ),
-aGuard
+i_instanceLock
 );
 }
 
 
//--
+void SAL_CALL SortableGridDataModel::removeColumnSort(  ) throw 
(RuntimeException)
+{
+MethodGuard aGuard( *this, rBHelper );
+DBG_CHECK_ME();
+impl_removeColumnSort( aGuard );
+}
+
+
//--
 Pair< ::sal_Int32, ::sal_Bool > SAL_CALL 
SortableGridDataModel::getCurrentSortOrder(  ) throw (RuntimeException)
 {
 MethodGuard aGuard( *this, rBHelper );
diff --git a/toolkit/source/controls/grid/sortablegriddatamodel.hxx 
b/toolkit/source/controls/grid/sortablegriddatamodel.hxx
index 4222ed6..d5dd1e4 100644
--- a/toolkit/source/controls/grid/sortablegriddatamodel.hxx
+++ b/toolkit/source/controls/grid/sortablegriddatamodel.hxx
@@ -179,6 +179,10 @@ namespace toolkit
 */
 voidimpl_rebuildIndexesAndNotify( MethodGuard& i_instanceLock );
 
+/** removes the current sorting, and notifies a change of al

[Libreoffice-commits] .: sc/source

2012-09-13 Thread Libreoffice Gerrit user

 sc/source/core/data/fillinfo.cxx |   13 ++---
 1 file changed, 2 insertions(+), 11 deletions(-)

New commits:
commit 732f3546c4051d92e544df6462022e7d07765e83
Author: Kohei Yoshida 
Date:   Wed Sep 12 15:35:05 2012 -0400

Let's just remove this.

Commit 291c919cf98347703e7ad2216b2b79aacd7cdfac made this dangling
code block.

Change-Id: Id8d09f1c364d621661c9d6584cd863f253c01d95

diff --git a/sc/source/core/data/fillinfo.cxx b/sc/source/core/data/fillinfo.cxx
index 1ee5a51..65b93cb 100644
--- a/sc/source/core/data/fillinfo.cxx
+++ b/sc/source/core/data/fillinfo.cxx
@@ -511,17 +511,8 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL 
nX1, SCROW nY1, SCCOL nX
 pInfo->pShadowAttr  = pShadowAttr;
 //  nWidth wird nicht mehr einzeln gesetzt
 
-bool bEmbed = false; //bIsEmbedded &&
-#if 0 // Huh? Is this intentional or accidental? Clang warns
-  // "expression result unused", so ifdef out these lines. The
-  // code has been like this since 2004.
-nTab>= aEmbedRange.aStart.Tab() &&
-nTab<= aEmbedRange.aEnd.Tab()   &&
-nX  >= aEmbedRange.aStart.Col() &&
-nX  <= aEmbedRange.aEnd.Col()   &&
-nCurRow >= aEmbedRange.aStart.Row() &&
-nCurRow <= aEmbedRange.aEnd.Row();
-#endif
+bool bEmbed = false;
+
 if (bScenario)
 {
 pInfo->pBackground = 
ScGlobal::GetButtonBrushItem();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/source

2012-09-13 Thread Libreoffice Gerrit user

 sc/source/core/tool/rangelst.cxx |   18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

New commits:
commit ff0e6c53782196fe1fc223ae08964a34eb20f740
Author: Kohei Yoshida 
Date:   Thu Sep 13 23:03:38 2012 -0400

Fix the order of template arguments.

Change-Id: Ibcc54168a6ca36cc57dd1b838e002f9a10ff29f3

diff --git a/sc/source/core/tool/rangelst.cxx b/sc/source/core/tool/rangelst.cxx
index f9e57b7..7ad7212 100644
--- a/sc/source/core/tool/rangelst.cxx
+++ b/sc/source/core/tool/rangelst.cxx
@@ -48,7 +48,7 @@ using ::formula::FormulaGrammar;
 namespace {
 
 template
-class FindEnclosingRange : public ::std::unary_function
+class FindEnclosingRange : public ::std::unary_function
 {
 public:
 FindEnclosingRange(const T& rTest) : mrTest(rTest) {}
@@ -62,7 +62,7 @@ private:
 };
 
 template
-class FindRangeIn : public ::std::unary_function
+class FindRangeIn : public ::std::unary_function
 {
 public:
 FindRangeIn(const T& rTest) : mrTest(rTest) {}
@@ -76,7 +76,7 @@ private:
 };
 
 template
-class FindIntersectingRange : public ::std::unary_function
+class FindIntersectingRange : public ::std::unary_function
 {
 public:
 FindIntersectingRange(const T& rTest) : mrTest(rTest) {}
@@ -89,7 +89,7 @@ private:
 const T& mrTest;
 };
 
-class AppendToList : public ::std::unary_function
+class AppendToList : public ::std::unary_function
 {
 public:
 AppendToList(vector& rRanges) : mrRanges(rRanges) {}
@@ -102,7 +102,7 @@ private:
 vector& mrRanges;
 };
 
-class CountCells : public ::std::unary_function
+class CountCells : public ::std::unary_function
 {
 public:
 CountCells() : mnCellCount(0) {}
@@ -122,7 +122,7 @@ private:
 size_t mnCellCount;
 };
 
-class FormatString : public ::std::unary_function
+class FormatString : public ::std::unary_function
 {
 public:
 FormatString(String& rStr, sal_uInt16 nFlags, ScDocument* pDoc, 
FormulaGrammar::AddressConvention eConv, sal_Unicode cDelim) :
@@ -160,15 +160,15 @@ private:
 bool mbFirst;
 };
 
-class FindDeletedRange : public ::std::unary_function
+class FindDeletedRange : public ::std::unary_function
 {
 public:
 FindDeletedRange( SCsCOL nDx, SCsROW nDy): mnDx(nDx), mnDy(nDy) {}
 FindDeletedRange( const FindDeletedRange& r) : mnDx(r.mnDx), mnDy(r.mnDy) 
{}
 bool operator() (const ScRange* p)
 {
-ScAddress rStart = p->aStart;
-ScAddress rEnd = p->aEnd;
+const ScAddress& rStart = p->aStart;
+const ScAddress& rEnd = p->aEnd;
 
 if( rEnd.Col() +mnDx < rStart.Col() )
 return true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] ::rtl::OUString to OUString in avmedia

2012-09-13 Thread Olivier Hallot (via Code Review)

Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/609

Approvals:
  Olivier Hallot: Verified; Looks good to me, approved


--
To view, visit https://gerrit.libreoffice.org/609
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If4a7bef339a626fbfa9f0c1cc76801e77626f38f
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Ricardo Montania 
Gerrit-Reviewer: Olivier Hallot 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2012-09-13 Thread Libreoffice Gerrit user

 avmedia/inc/avmedia/mediaitem.hxx |   12 ++--
 avmedia/inc/avmedia/mediaplayer.hxx   |4 ++--
 avmedia/inc/avmedia/mediawindow.hxx   |   14 +++---
 avmedia/source/framework/mediacontrol.cxx |2 +-
 4 files changed, 16 insertions(+), 16 deletions(-)

New commits:
commit cbc44df67cfd13849f3de85edcdd39b5fec8b06c
Author: Ricardo Montania 
Date:   Thu Sep 13 12:17:40 2012 -0300

::rtl::OUString to OUString in avmedia

Change-Id: If4a7bef339a626fbfa9f0c1cc76801e77626f38f
Reviewed-on: https://gerrit.libreoffice.org/609
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 

diff --git a/avmedia/inc/avmedia/mediaitem.hxx 
b/avmedia/inc/avmedia/mediaitem.hxx
index c4121a1..d286edd 100644
--- a/avmedia/inc/avmedia/mediaitem.hxx
+++ b/avmedia/inc/avmedia/mediaitem.hxx
@@ -114,11 +114,11 @@ public:
 voidsetZoom( ::com::sun::star::media::ZoomLevel eZoom 
);
 ::com::sun::star::media::ZoomLevel  getZoom() const;
 
-voidsetURL( const ::rtl::OUString& rURL,
-::rtl::OUString const*const pTempURL);
-const ::rtl::OUString&  getURL() const;
+voidsetURL( const OUString& rURL,
+OUString const*const pTempURL);
+const OUString&  getURL() const;
 
-const ::rtl::OUString&  getTempURL() const;
+const OUString&  getTempURL() const;
 
 private:
 
@@ -131,8 +131,8 @@ typedef ::avmedia::MediaItem avmedia_MediaItem;
 bool AVMEDIA_DLLPUBLIC EmbedMedia(
 ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel>
 const& xModel,
-::rtl::OUString const& rSourceURL,
-::rtl::OUString & o_rEmbeddedURL);
+OUString const& rSourceURL,
+OUString & o_rEmbeddedURL);
 
 }
 
diff --git a/avmedia/inc/avmedia/mediaplayer.hxx 
b/avmedia/inc/avmedia/mediaplayer.hxx
index b7d262f..d54565d 100644
--- a/avmedia/inc/avmedia/mediaplayer.hxx
+++ b/avmedia/inc/avmedia/mediaplayer.hxx
@@ -72,8 +72,8 @@ public:
 MediaFloater( SfxBindings* pBindings, 
SfxChildWindow* pCW, Window* pParent );
 ~MediaFloater();
 
-voidsetURL( const ::rtl::OUString& rURL, bool 
bPlayImmediately );
-const ::rtl::OUString&  getURL() const;
+voidsetURL( const OUString& rURL, bool 
bPlayImmediately );
+const OUString& getURL() const;
 
 voiddispatchCurrentURL();
 
diff --git a/avmedia/inc/avmedia/mediawindow.hxx 
b/avmedia/inc/avmedia/mediawindow.hxx
index ab9bae2..696e2e4 100644
--- a/avmedia/inc/avmedia/mediawindow.hxx
+++ b/avmedia/inc/avmedia/mediawindow.hxx
@@ -63,7 +63,7 @@ namespace rtl { class OUString; }
 
 namespace avmedia
 {
-typedef ::std::vector< ::std::pair< ::rtl::OUString, ::rtl::OUString > > 
FilterNameVector;
+typedef ::std::vector< ::std::pair< OUString, OUString > > 
FilterNameVector;
 
 class MediaItem;
 
@@ -79,8 +79,8 @@ namespace avmedia
 MediaWindow( Window* parent, bool 
bInternalMediaControl );
 virtual ~MediaWindow();
 
-voidsetURL( const ::rtl::OUString& rURL );
-const ::rtl::OUString&  getURL() const;
+voidsetURL( const OUString& rURL );
+const OUString& getURL() const;
 
 boolisValid() const;
 SizegetPreferredSize() const;
@@ -121,13 +121,13 @@ namespace avmedia
 /// @param o_pbLink if not 0, this is an "insert" dialog: display link
 /// checkbox and store its state in *o_pbLink
 static bool executeMediaURLDialog( Window* pParent,
-::rtl::OUString& rURL, bool *const o_pbLink );
+OUString& rURL, bool *const o_pbLink );
 static void executeFormatErrorBox( Window* pParent );
-static bool isMediaURL( const ::rtl::OUString& rURL, bool 
bDeep = false, Size* pPreferredSizePixel = NULL );
+static bool isMediaURL( const OUString& rURL, bool bDeep = 
false, Size* pPreferredSizePixel = NULL );
 
-static ::com::sun::star::uno::Reference< 
::com::sun::star::media::XPlayer > createPlayer( const ::rtl::OUString& rURL );
+static ::com::sun::star::uno::Reference< 
::com::sun::star::media::XPlayer > createPlayer( const OUString& rURL );
 
-static ::com::sun::star::uno::Reference< 
::com::sun::star::graphic::XGraphic > grabFrame( const ::rtl::OUString& rURL,
+static ::com::sun::star::uno::Reference< 
::com::sun::star::graphic::XGraphic > grabFrame( const OUString& rURL,

   bool bAllowToCreateReplacementGraphic = false,

   double fMedia

[PUSHED] More ::rtl::OUString to OUString and RTL_CONSTASCII in avmed...

2012-09-13 Thread Olivier Hallot (via Code Review)

Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/610

Approvals:
  Olivier Hallot: Verified; Looks good to me, approved


--
To view, visit https://gerrit.libreoffice.org/610
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I925862289cf5f9f41af5532bbbaf8ec0a4e5a66b
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Ricardo Montania 
Gerrit-Reviewer: Olivier Hallot 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: avmedia/source

2012-09-13 Thread Libreoffice Gerrit user

 avmedia/source/framework/mediaitem.cxx|   51 +-
 avmedia/source/framework/mediaplayer.cxx  |6 +--
 avmedia/source/framework/mediatoolbox.cxx |6 +--
 3 files changed, 29 insertions(+), 34 deletions(-)

New commits:
commit 45c86d8a7b86315240fe6764f2c89e9499bf4e20
Author: Ricardo Montania 
Date:   Thu Sep 13 13:05:31 2012 -0300

More ::rtl::OUString to OUString and RTL_CONSTASCII in avmedia

Change-Id: I925862289cf5f9f41af5532bbbaf8ec0a4e5a66b
Reviewed-on: https://gerrit.libreoffice.org/610
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 

diff --git a/avmedia/source/framework/mediaitem.cxx 
b/avmedia/source/framework/mediaitem.cxx
index 2dda7a9..014ea2d 100644
--- a/avmedia/source/framework/mediaitem.cxx
+++ b/avmedia/source/framework/mediaitem.cxx
@@ -59,8 +59,8 @@ TYPEINIT1_AUTOFACTORY( MediaItem, ::SfxPoolItem );
 
 struct MediaItem::Impl
 {
-::rtl::OUString m_URL;
-::rtl::OUString m_TempFileURL;
+OUStringm_URL;
+OUStringm_TempFileURL;
 sal_uInt32  m_nMaskSet;
 MediaState  m_eState;
 double  m_fTime;
@@ -243,22 +243,22 @@ sal_uInt32 MediaItem::getMaskSet() const
 
 //
 
-void MediaItem::setURL( const ::rtl::OUString& rURL,
-::rtl::OUString const*const pTempURL)
+void MediaItem::setURL( const OUString& rURL,
+OUString const*const pTempURL)
 {
 m_pImpl->m_URL = rURL;
 m_pImpl->m_nMaskSet |= AVMEDIA_SETMASK_URL;
-m_pImpl->m_TempFileURL = (pTempURL) ? *pTempURL : ::rtl::OUString();
+m_pImpl->m_TempFileURL = (pTempURL) ? *pTempURL : OUString();
 }
 
 //
 
-const ::rtl::OUString& MediaItem::getURL() const
+const OUString& MediaItem::getURL() const
 {
 return m_pImpl->m_URL;
 }
 
-const ::rtl::OUString& MediaItem::getTempURL() const
+const OUString& MediaItem::getTempURL() const
 {
 return m_pImpl->m_TempFileURL;
 }
@@ -370,18 +370,17 @@ void MediaItem::setZoom( 
::com::sun::star::media::ZoomLevel eZoom )
 
 //
 
-static ::rtl::OUString lcl_GetFilename(::rtl::OUString const& rSourceURL)
+static OUString lcl_GetFilename(OUString const& rSourceURL)
 {
 uno::Reference const xUriFactory(
 ::comphelper::createProcessComponent(
-::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-"com.sun.star.uri.UriReferenceFactory"))),
+"com.sun.star.uri.UriReferenceFactory"),
 uno::UNO_QUERY_THROW);
 
 uno::Reference const xSourceURI(
 xUriFactory->parse(rSourceURL), uno::UNO_SET_THROW);
 
-::rtl::OUString filename;
+OUString filename;
 {
 sal_Int32 const nSegments(xSourceURI->getPathSegmentCount());
 if (0 < nSegments)
@@ -392,21 +391,21 @@ static ::rtl::OUString lcl_GetFilename(::rtl::OUString 
const& rSourceURL)
 if (!::comphelper::OStorageHelper::IsValidZipEntryFileName(
 filename, false) || !filename.getLength())
 {
-filename = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("media"));
+filename = "media";
 }
 return filename;
 }
 
 static uno::Reference
 lcl_CreateStream(uno::Reference const& xStorage,
-::rtl::OUString const& rFilename)
+OUString const& rFilename)
 {
-::rtl::OUString filename(rFilename);
+OUString filename(rFilename);
 
 if (xStorage->hasByName(filename))
 {
-::rtl::OUString basename;
-::rtl::OUString suffix;
+OUString basename;
+OUString suffix;
 sal_Int32 const nIndex(rFilename.lastIndexOf(sal_Unicode('.')));
 if (0 < nIndex)
 {
@@ -417,7 +416,7 @@ lcl_CreateStream(uno::Reference const& 
xStorage,
 do
 {
 ++count;
-filename = basename + ::rtl::OUString::valueOf(count) + suffix;
+filename = basename + OUString::valueOf(count) + suffix;
 }
 while (xStorage->hasByName(filename));
 }
@@ -429,21 +428,18 @@ lcl_CreateStream(uno::Reference const& 
xStorage,
 uno::Reference< beans::XPropertySet > const xStreamProps(xStream,
 uno::UNO_QUERY);
 if (xStreamProps.is()) { // this is NOT supported in FileSystemStorage
-xStreamProps->setPropertyValue(
-::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")),
-uno::makeAny(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+xStreamProps->setPropertyValue("MediaType", uno::makeAny(OUString(
 //FIXME how to detect real media type?
 //but currently xmloff has this one hardcoded anyway...
-"application/vnd.sun.star.media";
+"application/vnd.sun.star.media")));
 xStreamProps->setPropertyValue( // turn off compression
-:

Build id question

2012-09-13 Thread Mat M


Hello

I was using an "official" build to test.
THe about box gives me:
LibreOffice 3.5.6.2
Version ID : e0fbe70-5879838-a0745b0-0cd1158-638b327

IIUC, the commit id matching this is 45d6f613425c [1] or 72d3b35748b [2]

Is there a way to get back to the commit id from the build id ? I thought  
as seen in [3], that first block is the core commit id.


Can we have an update about that ?

[1]:  
http://cgit.freedesktop.org/libreoffice/core/log/?qt=range&q=45d6f613425c
[2]:  
http://cgit.freedesktop.org/libreoffice/core/log/?qt=range&q=72d3b35748b

[3]: https://www.libreoffice.org/get-help/nabble-mailing-list-interface/

TY & Regards
--
Mat M
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'feature/mork' - connectivity/source

2012-09-13 Thread Libreoffice Gerrit user

 connectivity/source/drivers/mork/MConnection.hxx  |1 
 connectivity/source/drivers/mork/MQueryHelper.cxx |   21 
 connectivity/source/drivers/mork/MQueryHelper.hxx |2 +
 connectivity/source/drivers/mork/MResultSet.cxx   |   37 +-
 4 files changed, 45 insertions(+), 16 deletions(-)

New commits:
commit f1f40a616b905a62fb9c6fc1bb6af30262debb0b
Author: David Ostrovsky 
Date:   Fri Sep 14 00:07:07 2012 +0200

mork driver: get rid of infinite loop.

Many thanks to Michael Stahl for helping out
with debugging it. The problem was, that soffice.bin
grabbed the mouse and keyboard. Michael pointed me out
to alternate Xephyr X-Server. With it it was the matter
of 5 min. to attach a debugger to soffice.bin and to
find the problem.

Change-Id: Ic8340fbd87e65945b12f4a928c73fa23a439d9f4

diff --git a/connectivity/source/drivers/mork/MConnection.hxx 
b/connectivity/source/drivers/mork/MConnection.hxx
index 72cf592..fd478ff 100644
--- a/connectivity/source/drivers/mork/MConnection.hxx
+++ b/connectivity/source/drivers/mork/MConnection.hxx
@@ -109,7 +109,6 @@ namespace connectivity
 // Added to enable me to use SQLInterpreter which requires an
 // XNameAccess i/f to access tables.
 ::com::sun::star::uno::Reference< 
::com::sun::star::sdbcx::XTablesSupplier > SAL_CALL createCatalog();
-
 };
 }
 }
diff --git a/connectivity/source/drivers/mork/MQueryHelper.cxx 
b/connectivity/source/drivers/mork/MQueryHelper.cxx
index 6b4e351..7803d67 100644
--- a/connectivity/source/drivers/mork/MQueryHelper.cxx
+++ b/connectivity/source/drivers/mork/MQueryHelper.cxx
@@ -158,6 +158,26 @@ sal_Int32 MQueryHelper::getResultCount() const
 
 // -
 
+sal_Bool MQueryHelper::queryComplete() const
+{
+return sal_True;
+}
+
+sal_Bool MQueryHelper::checkRowAvailable( sal_Int32 nDBRow )
+{
+/*
+while (!queryComplete() && getResultCount() <= (sal_uInt32)nDBRow)
+{
+if ( !m_aQueryHelper->waitForRow( nDBRow ) ) {
+m_aError = m_aQueryHelper->getError();
+return( sal_False );
+}
+}
+*/
+return( getResultCount() > nDBRow );
+}
+
+
 sal_Bool MQueryHelper::getRowValue( ORowSetValue& rValue, sal_Int32 
nDBRow,const rtl::OUString& aDBColumnName, sal_Int32 nType )
 {
 SAL_INFO("connectivity.mork", "MQueryHelper::getRowValue()" );
@@ -185,6 +205,7 @@ sal_Bool MQueryHelper::getRowValue( ORowSetValue& rValue, 
sal_Int32 nDBRow,const
 
 sal_Int32 MQueryHelper::executeQuery(OConnection* xConnection)
 {
+//OSL_FAIL( "MQueryHelper::executeQuery" );
 SAL_INFO("connectivity.mork", "MQueryHelper::executeQuery()" );
 reset();
 
diff --git a/connectivity/source/drivers/mork/MQueryHelper.hxx 
b/connectivity/source/drivers/mork/MQueryHelper.hxx
index 2d186a8..8275837 100644
--- a/connectivity/source/drivers/mork/MQueryHelper.hxx
+++ b/connectivity/source/drivers/mork/MQueryHelper.hxx
@@ -82,7 +82,9 @@ namespace connectivity
 MQueryHelperResultEntry*   next();
 MQueryHelperResultEntry*   getByIndex( sal_uInt32 nRow );
 sal_Bool   isError() const;
+sal_Bool   queryComplete() const;
 sal_Int32  getResultCount() const;
+sal_Bool   checkRowAvailable( sal_Int32 nDBRow );
 sal_Bool getRowValue( ORowSetValue& rValue, sal_Int32 nDBRow,const 
rtl::OUString& aDBColumnName, sal_Int32 nType );
 sal_Int32 executeQuery(OConnection* xConnection);
 };
diff --git a/connectivity/source/drivers/mork/MResultSet.cxx 
b/connectivity/source/drivers/mork/MResultSet.cxx
index d7d7117..8363901 100644
--- a/connectivity/source/drivers/mork/MResultSet.cxx
+++ b/connectivity/source/drivers/mork/MResultSet.cxx
@@ -467,8 +467,8 @@ sal_Bool SAL_CALL OResultSet::isAfterLast(  ) 
throw(SQLException, RuntimeExcepti
 ResultSetEntryGuard aGuard( *this );
 
 OSL_TRACE("In/Out: OResultSet::isAfterLast" );
-return sal_True;
-//return m_nRowPos > currentRowCount() && m_aQuery.queryComplete();
+//return sal_True;
+return m_nRowPos > currentRowCount() && m_aQueryHelper.queryComplete();
 }
 // -
 sal_Bool SAL_CALL OResultSet::isFirst(  ) throw(SQLException, RuntimeException)
@@ -485,8 +485,8 @@ sal_Bool SAL_CALL OResultSet::isLast(  ) 
throw(SQLException, RuntimeException)
 ResultSetEntryGuard aGuard( *this );
 
 OSL_TRACE("In/Out: OResultSet::isLast" );
-return sal_True;
-//return m_nRowPos == currentRowCount() && m_aQuery.queryComplete();
+//return sal_True;
+return m_nRowPos == currentRowCount() && m_aQueryHelper.queryComplete();
 }
 // -
 void SAL_CALL OResultSet::beforeFirst(  ) throw(SQLExcep

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

2012-09-13 Thread Libreoffice Gerrit user

 helpcontent2/source/text/scalc/01/0112.xhp|2 +-
 helpcontent2/source/text/simpress/00/0404.xhp |3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 9d34a6766812333d9bd76ae56b1f0413dd36e8f0
Author: Andras Timar 
Date:   Thu Sep 13 23:38:24 2012 +0200

fdo#54735 wrong -tag in Help par_id3153935

Change-Id: Idef63c0468fec89624ba601e86dd998408e1c864

diff --git a/helpcontent2/source/text/simpress/00/0404.xhp 
b/helpcontent2/source/text/simpress/00/0404.xhp
index 9582561..b822cb9 100644
--- a/helpcontent2/source/text/simpress/00/0404.xhp
+++ b/helpcontent2/source/text/simpress/00/0404.xhp
@@ -127,8 +127,7 @@
 
 Choose Insert - Fields - Time 
(variable)
 
-Choose Insert - Fields 
-- Page Number 
+Choose Insert - Fields - Page 
Number
 
 Choose Insert - Fields - Author
 
commit 580a405c08ef8f07a38b26127afe5856d3faf45e
Author: Andras Timar 
Date:   Thu Sep 13 23:31:27 2012 +0200

fdo#54734 Missing -tag for MAC in Help par_id9838862

Change-Id: Ib8e6ba6d046eabb746d798351b4320f8c2663304

diff --git a/helpcontent2/source/text/scalc/01/0112.xhp 
b/helpcontent2/source/text/scalc/01/0112.xhp
index f07cbf4..5b34227 100644
--- a/helpcontent2/source/text/scalc/01/0112.xhp
+++ b/helpcontent2/source/text/scalc/01/0112.xhp
@@ -49,7 +49,7 @@
   
 
 Use 
the icons on the Page Preview Bar to scroll through the pages of 
the document or to print the document.
-You 
can also press CommandCtrl+Page
 Up and Ctrl+Page Down keys to scroll through the pages.
+You 
can also press CommandCtrl+Page
 Up and CommandCtrl+Page
 Down keys to scroll through the pages.
 You 
cannot edit your document while you are in the page preview.
 
 To exit the page 
preview, click the Close Preview button.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Revised Mac OS X mimetype icons

2012-09-13 Thread Nicholas Shanks

Turned out the 2px/4px leftward shift error was present in all icons I
had exported from Inkscape. I blame Inkscape :-)
I have amended the PNGs and rebuilt the icns files.

http://web.nickshanks.com/libreoffice/mimetypes-revised.tgz

-- 
Nicholas.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: xmlhelp/util

2012-09-13 Thread Libreoffice Gerrit user

 xmlhelp/util/main_transform.xsl |9 +
 1 file changed, 9 insertions(+)

New commits:
commit 9302520ff445d9789859f501b8bd6bc32c300e26
Author: Andras Timar 
Date:   Thu Sep 13 20:25:47 2012 +0200

enable indentation of Basic source code in help fdo#41737

Change-Id: I63308cb7cbe21cb28082c815b53a3cbf286fe3ab

diff --git a/xmlhelp/util/main_transform.xsl b/xmlhelp/util/main_transform.xsl
index f32cc9d..bb61369 100644
--- a/xmlhelp/util/main_transform.xsl
+++ b/xmlhelp/util/main_transform.xsl
@@ -371,6 +371,10 @@

 

+   
+   
+   
+



@@ -594,6 +598,11 @@

 
 
+
+
+   
+
+
 
 

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

Re: Regression in isHidden-Property of Frames

2012-09-13 Thread Thorsten Behrens

Andor E wrote:
> During these tests we found a change in the behaviour of the
> isHidden-Property of frames.
> We're using a com.sun.star.document.XEventListener to listen to the
> onViewCreated-Event. We then test, if the document is visible, and
> only then WollMux will process the document.
> In OOo 3.2.1 a new document created with File/New would have isHidden
> == false. In LO the document now returns isHidden == true.
> I have searched in the sources of LO and found a change in
> ./framework/source/services/frame.cxx. This was introduced with the
> commit74ffe76476d5b8941454a2acce569737237fc1d7.
> I believe that this change is wrong and should be reverted. Before the
> change isHidden represented the intended state of a frame. A document
> that was openened hidden, returned hidden. A document opened visible
> returned not hidden. Now it will always return isHidden == true. If
> this isn't changed back,  there needs to be another property to check
> the intended visibilty.
> 
Hi Andor,

hmmm - so the change should *only* affect the timing of returning
the intended value, not the ultimate correctness. If you look at how
m_bIsHidden is treated inside framework/source/services/frame.cxx,
it will eventually get set to false, when the window is _really_
visible. I suspect this is just a timing issue, any chance to check
the state in a later event?

HTH,

-- Thorsten


pgpRtZo9Nm6EP.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Impress Remote: Bluetooth on Windows

2012-09-13 Thread Andrzej J. R. Hunt


Hi everyone,

Impress Remote now supports Bluetooth on windows (currently only using 
the Microsoft Bluetooth stack) -- thanks to tml for pointing out why the 
headers I needed were breaking. (Control over wifi/network also works on 
windows -- the dialog which previously didn't work has started 
functioning, although I don't know why it previously didn't work / 
haven't made any changes to it.)


Connection-wise that means only Mac support needs looking at: assuming 
osl Sockets work as expected control over wifi/network should function, 
and assuming unix sockets with multicast also work then discovery should 
be functional too. Bluetooth will require a platform-specific 
implementation -- is this suitable as an easyhack?


(At the moment I'm working on polishing the UI of the app and making it 
consistent across android versions.)


Cheers,

Andrzej
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Correction for one Mac OS X icon file (bug 54820)

2012-09-13 Thread Nicholas Shanks

See the bottom of this bug for the summary:
https://bugs.freedesktop.org/show_bug.cgi?id=54820

I suspected as soon as I saw the behaviour, the PNGs from which the
icns file was generated specify a non-zero image offset (a.k.a.
vitrual canvas, or page). See:
http://www.imagemagick.org/Usage/basics/#page

However that does not appear to be the case:

mars:~ nickshanks$ identify main.png
main.png PNG 128x128 128x128+0+0 8-bit DirectClass 2.27KB 0.000u 0:00.019
mars:~ nickshanks$ identify main.png
main.png PNG 256x256 256x256+0+0 8-bit DirectClass 4.38KB 0.000u 0:00.000

(note the +0+0 canvas offset)
As such I don't know what caused the borders to appear, but anyway,
the file here fixes the issue:
http://web.nickshanks.com/libreoffice/revised-main-icon.tgz

Again, the file paths inside are relative to in the
core/sysui/desktop/ directory, so extracting there will overwrite the
old files. (And I gzipped it this time for all you gzip lovers out
there ;-)

The package also contains revised 512x512 and 1024x1024 icons, because
the originals were 2px and 4px too far left, respectively. When
zooming the icon size up and down, there was a perceptible jump at the
256–257px boundary. I also pngcrushed them (with -brute).

Note of caution to anyone working with PNGs on Mac OS X: Pixelmator
used an unexpected colour profile when opening an image which has no
embedded profile (might be my monitor's calibration profile?). I had
to use Acorn to move the pixels.

-- 
Nicholas.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'feature/unitymenus' - 3 commits - vcl/inc vcl/source vcl/unx

2012-09-13 Thread Libreoffice Gerrit user

 vcl/inc/unx/gtk/gloactiongroup.h  |4 
 vcl/inc/unx/gtk/glomenu.h |6 +
 vcl/inc/unx/gtk/gtksalmenu.hxx|   12 +-
 vcl/source/window/menu.cxx|5 
 vcl/unx/gtk/window/gloactiongroup.cxx |   59 +--
 vcl/unx/gtk/window/glomenu.cxx|   28 +
 vcl/unx/gtk/window/gtksalmenu.cxx |  177 +-
 7 files changed, 249 insertions(+), 42 deletions(-)

New commits:
commit 1316b2293bb9cfae49e36db3645759b688cf63e9
Author: Antonio Fernandez 
Date:   Thu Sep 13 20:08:07 2012 +0100

Fixed a crash when opening an application from LO main screen.

Change-Id: I942bcf761c7b9ba11c47bc618d55bdc85a472705

diff --git a/vcl/unx/gtk/window/gtksalmenu.cxx 
b/vcl/unx/gtk/window/gtksalmenu.cxx
index 1476e61..94e13a1 100644
--- a/vcl/unx/gtk/window/gtksalmenu.cxx
+++ b/vcl/unx/gtk/window/gtksalmenu.cxx
@@ -20,7 +20,7 @@
  * Author: Antonio FernÃ¡ndez 
  */
 
-#include "unx/gtk/gtksalmenu.hxx"
+#include 
 
 //#include 
 #include 
@@ -421,7 +421,7 @@ GtkSalMenu::GtkSalMenu( sal_Bool bMenuBar ) :
 GtkSalMenu::~GtkSalMenu()
 {
 if ( mbMenuBar == sal_True ) {
-g_source_remove_by_user_data( this );
+//g_source_remove_by_user_data( this );
 
 ((GtkSalFrame*) mpFrame)->SetMenu( NULL );
 
commit 872944ec078f6fd8e2de7d3001b8768b8c00b107
Author: Antonio Fernandez 
Date:   Wed Sep 12 20:45:31 2012 +0100

Menus are generated on demand now, but with some issues.

Change-Id: Icec9b685e720a369cff4d2bbfc5bf4ba6614e390

diff --git a/vcl/inc/unx/gtk/gloactiongroup.h b/vcl/inc/unx/gtk/gloactiongroup.h
index e0d783f..61ec718 100644
--- a/vcl/inc/unx/gtk/gloactiongroup.h
+++ b/vcl/inc/unx/gtk/gloactiongroup.h
@@ -67,11 +67,13 @@ GLOActionGroup *g_lo_action_group_new   
(gpointer
 
 voidg_lo_action_group_insert(GLOActionGroup
 *group,
  const gchar   
 *action_name,
- gint  
  item_id);
+ gint  
  item_id,
+ gboolean  
  submenu);
 
 voidg_lo_action_group_insert_stateful   (GLOActionGroup
 *group,
  const gchar   
 *action_name,
  gint  
  item_id,
+ gboolean  
  submenu,
  const 
GVariantType *parameter_type,
  const 
GVariantType *state_type,
  GVariant  
 *state_hint,
diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx
index d7d5966..56aed28 100644
--- a/vcl/inc/unx/gtk/gtksalmenu.hxx
+++ b/vcl/inc/unx/gtk/gtksalmenu.hxx
@@ -55,7 +55,7 @@ private:
 GMenuModel* mpMenuModel;
 GActionGroup*   mpActionGroup;
 
-GtkSalMenu* GetMenuForItemCommand( gchar* aCommand );
+GtkSalMenu* GetMenuForItemCommand( gchar* aCommand, 
gboolean bGetSubmenu );
 
 public:
 GtkSalMenu( sal_Bool bMenuBar );
@@ -101,6 +101,8 @@ public:
 voidNativeSetAccelerator( unsigned nSection, 
unsigned nItemPos, const KeyCode& rKeyCode, const rtl::OUString& rKeyName );
 
 voidDispatchCommand( gint itemId, const gchar* 
aCommand );
+voidActivate( const gchar* aMenuCommand );
+voidDeactivate( const gchar* aMenuCommand );
 };
 
 class GtkSalMenuItem : public SalMenuItem
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index e921805..7fc74e4 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -1146,8 +1146,7 @@ void Menu::Select()
 }
 }
 
-// FIXME: Workaround to make GLOMenu without defining macros.
-//#if defined(QUARTZ)
+#if defined(QUARTZ)
 void Menu::ImplSelectWithStart( Menu* pSMenu )
 {
 Menu* pOldStartedFrom = pStartedFrom;
@@ -1158,7 +1157,7 @@ void Menu::ImplSelectWithStart( Menu* pSMenu )
 pOldStartedFrom->pStartedFrom = pOldStartedStarted;
 pStartedFrom = pOldStartedFrom;
 }
-//#endif
+#endif
 
 void Menu::RequestHelp( const HelpEvent& )
 {
diff --git a/vcl/unx/gtk/window/gloactiongroup.cxx 
b/vcl/unx/gtk/window/gloactiongroup.cxx
index 171341d..1117388 100644
--- a/vcl/unx/gtk/window/gloactiongroup.cxx
+++ b/vcl/unx/gtk/window/gloactiongroup.cxx
@@ -43,7 +43,8 @@ struct _GLOAction
 GObject parent_instance;
 
 gintitem_id;// Menu item ID.
-gbooleanenabled;// TRUE if

[Libreoffice-commits] .: sd/source

2012-09-13 Thread Libreoffice Gerrit user

 sd/source/ui/remotecontrol/BluetoothServer.cxx  |  103 +++-
 sd/source/ui/remotecontrol/DiscoveryService.cxx |4 
 2 files changed, 101 insertions(+), 6 deletions(-)

New commits:
commit 741c56aa7309505f855e58239205cfa4b1d091dd
Author: Andrzej J.R. Hunt 
Date:   Thu Sep 13 20:58:12 2012 +0200

Add support for Windows Bluetooth Stack.

Change-Id: I3a039889a033591c81e0fd531de3b053e8fa1b3e

diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx 
b/sd/source/ui/remotecontrol/BluetoothServer.cxx
index 5bf242c..01adb96 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
@@ -18,9 +18,16 @@
 #include "bluetooth/rfcomm.h"
 #endif
 
+#ifdef WIN32
+  #undef MSC // Unset a legacy define, as otherwise ws2bth.h breaks
+  #include 
+  #include 
+#endif
+
 // FIXME: move this into an external file and look at sharing definitions
 // across OS's (i.e. UUID and port ).
 // Also look at determining which ports are available.
+// Alternatively use the binary sdp record
 #define BLUETOOTH_SERVICE_RECORD ""
 
 #include "Communicator.hxx"
@@ -146,10 +153,102 @@ void BluetoothServer::execute()
 }
 }
 
-#else
+// LINUX && ENABLE_DBUS
+#elif defined(WIN32)
+WORD wVersionRequested;
+WSADATA wsaData;
 
-(void) mpCommunicators; // avoid warnings about unused member
+wVersionRequested = MAKEWORD(2, 2);
+
+if ( WSAStartup(wVersionRequested, &wsaData) )
+{
+return; // winsock dll couldn't be loaded
+}
+
+int aSocket = socket( AF_BTH, SOCK_STREAM, BTHPROTO_RFCOMM );
+if ( !aSocket )
+{
+WSACleanup();
+return;
+}
+SOCKADDR_BTH aAddr;
+aAddr.addressFamily = AF_BTH;
+aAddr.btAddr = 0;
+aAddr.serviceClassId = GUID_NULL;
+aAddr.port = BT_PORT_ANY; // Select any free socket.
+if ( bind( aSocket, (SOCKADDR*) &aAddr, sizeof(aAddr) ) == SOCKET_ERROR )
+{
+closesocket( aSocket );
+WSACleanup();
+return;
+}
+
+SOCKADDR aName;
+int aNameSize = sizeof(aAddr);
+getsockname( aSocket, &aName, &aNameSize ); // Retrieve the local address 
and port
+
+CSADDR_INFO aAddrInfo;
+memset( &aAddrInfo, 0, sizeof(aAddrInfo) );
+aAddrInfo.LocalAddr.lpSockaddr = &aName;
+aAddrInfo.LocalAddr.iSockaddrLength = sizeof( SOCKADDR_BTH );
+aAddrInfo.RemoteAddr.lpSockaddr = &aName;
+aAddrInfo.RemoteAddr.iSockaddrLength = sizeof( SOCKADDR_BTH );
+aAddrInfo.iSocketType = SOCK_STREAM;
+aAddrInfo.iProtocol = BTHPROTO_RFCOMM;
+
+// To be used for setting a custom UUID once available.
+//GUID uuid;
+//uuid.Data1 = 0x1101;
+//  memset( &uuid, 0x1000 + UUID*2^96, sizeof( GUID ) );
+//uuid.Data2 = 0;
+//uuid.Data3 = 0x1000;
+//ULONGLONG aData4 = 0x80805F9B34FB;
+//memcpy( uuid.Data4, &aData4, sizeof(uuid.Data4) );
+
+WSAQUERYSET aRecord;
+memset( &aRecord, 0, sizeof(aRecord));
+aRecord.dwSize = sizeof(aRecord);
+aRecord.lpszServiceInstanceName = "LibreOffice-SDRemote"; // Optional
+aRecord.lpszComment = "Remote control of presentations over bluetooth.";
+aRecord.lpServiceClassId = (LPGUID) &SerialPortServiceClass_UUID;
+aRecord.dwNameSpace = NS_BTH;
+aRecord.dwNumberOfCsAddrs = 1;
+aRecord.lpcsaBuffer = &aAddrInfo;
+
+if ( WSASetService( &aRecord, RNRSERVICE_REGISTER, 0 ) == SOCKET_ERROR )
+{
+closesocket( aSocket );
+WSACleanup();
+return;
+}
 
+if ( listen( aSocket, 1 ) == SOCKET_ERROR )
+{
+closesocket( aSocket );
+WSACleanup();
+return;
+}
+
+SOCKADDR_BTH aRemoteAddr;
+int aRemoteAddrLen = sizeof(aRemoteAddr);
+while ( true )
+{
+int bSocket;
+if ( (bSocket = accept(aSocket, (sockaddr*) &aRemoteAddr, 
&aRemoteAddrLen)) == INVALID_SOCKET )
+{
+closesocket( aSocket );
+WSACleanup();
+return;
+} else {
+Communicator* pCommunicator = new Communicator( new 
BufferedStreamSocket( bSocket) );
+mpCommunicators->push_back( pCommunicator );
+pCommunicator->launch();
+}
+}
+
+// WIN32
+#else // !(defined(LINUX) && defined(ENABLE_DBUS)) && !defined(WIN32)
+(void) mpCommunicators; // avoid warnings about unused member
 #endif
 }
 
diff --git a/sd/source/ui/remotecontrol/DiscoveryService.cxx 
b/sd/source/ui/remotecontrol/DiscoveryService.cxx
index 51982a3..805ce0c 100644
--- a/sd/source/ui/remotecontrol/DiscoveryService.cxx
+++ b/sd/source/ui/remotecontrol/DiscoveryService.cxx
@@ -65,16 +65,12 @@ DiscoveryService::~DiscoveryService()
 void DiscoveryService::execute()
 {
 char aBuffer[BUFFER_SIZE];
-fprintf( stderr,"Created\n" );
 while ( true )
 {
 memset( aBuffer, 0, sizeof(char) * BUFFER_SIZE );
 sockaddr_in aAddr;
 socklen_t aLen = sizeof( aAddr );
-fprintf( stderr,"REcing\n" );
 r

minutes of ESC call ...

2012-09-13 Thread Michael Meeks

* Present:
+ Fridrich, Lionel, Stephan, Norbert, Andras, Kendy,
  Michael M, Kohei, Cedric, David, Joel, Astron, Cloph

* Completed Action Items
+ enable evolution connector in distro-config for Linux (Lionel)
+ change pre-selection of default dictionaries to install (Stephan)
+ massive help indexing acceleration already in 3.6.2
+ due for 3.6.3
+ enable debug bits for Mac tinderbox (Norbert)
+ debug information enabled & live: --with-symbols
+ work-out a nice size limit for bundled fonts (Kendy)
+ [punt it] in favour of new font download solution
  Lubos working on it - struggling with caches.
+ conference papers committee assistance (Norbert)

* Pending Action Items
+ [pending] make bytemark windows box do release builds (Fridrich)
+ crediting: can we separate templates in the credits page (Spaetz)
+ gerrit - patch abandonment can only be done by owner or gerrit admin 
(Bjoern)
+ gerrit - update docs in wiki (Bjoern)
+ Petr to decide release-schedule / overlap gap issue
+ change to contract and OSL_TRACE for oob results in OUString::copy 
(Michael)

* Release Engineering update (Fridrich)
+ 3.6.2 rc1 status
+ in pre-release, populating mirrors.
+ 3.5.7 rc1 - September 17th (next Monday)
+ Fridrich doing releng while Petr on vacation
+ likes most patches integrated by Friday for slower hardware

* conference program update (Norbert/Cedric/Fridrich)
+ conference looking good, lots of interesting papers
+ papers will be availble on line

* Joel introduction / welcome
+ joined a couple of months ago
+ mostly doing trigaing
+ some coding fixes

* emotive plea for more easy-hacks (Andras)
+ lots of students / volunteers chewing through the easy hacks
+ need more Easy Hacks particularly tasks:
+ that can take a few weeks for new hackers.
+ not trivial cleanup (only useful to learn review process)
+ more substantial / interesting: three week bits.
+ new volunteers: could they learn by triaging.

* UI / design update (Astron)
+ gradient-fill for cells:
+ review: better for whole areas rather than cells
+ interoperability issues ?
+ borders query:
+ we have to pick sensible default options / settings
+ Android icon underway with Alex's help
+ work ongoing improving icon themes too
+ options reduction ongoing interest
AI: + new git repository needed for UI stuff 'original-artwork' (Norbert)

* QA update (Joel)
+ immature interaction styles in bugzilla
+ encourage people to interact positively
+ don't just ask to reproduce on latest
  ver. unless v. old
+ more complication wrt. when to 'close' bugs ...
+ only developers should close it resolved->fixed
+ unless QA can resolve exactly when.
+ use resolved->worksforme instead.
+ do we close a bug when it's fixed on master or all branches ?
+ some things get fixed but related to separate bugs
+ the bug-bot adds helpful comments when it's cherry-picked
+ prefer fixed when fixed on master (Kendy)
+ tracker bug dependencies different (Lionel)
+ crossed out only when it's fixed in that branch
+ problem remembering coming back to close it later (Norbert)
+ is it ok to close worksforme if it works on master ?
+ if not so serious for back-porting, ok (Lionel)
+ worth having the latest stable branch in parallel
  not worth going back further for worksforme
+ what proportion are 'worksforme' ? (Kendy)
+ rougly:
+ 50% => needinfo
+ 25% workforme
+ 25% => developers
+ some annoying bugs with calc (Rainer)
+ really helps to have actual documents etc. (Kohei)
+ eg. https://bugs.freedesktop.org/show_bug.cgi?id=54498
+ many are duplicates: moggi addressing the core issue
  on an overheating laptop.
+ begging for more triage volunteers:
+ once we catch-up all is good; but we're so far behind.
+ catch-up 10x bugs per week but a 1300 backlog
+ 20-30 new per day.
+ lots of user-appreciation.
**  + http://wiki.documentfoundation.org/BugTriage  **
+ need help confirming some 2011 bugs:
+ 
https://bugs.freedesktop.org/buglist.cgi?list_id=12

Re: --headless broken with --enable-headless

2012-09-13 Thread Riccardo Magliocchetti


Hello Dag,

Il 12/09/2012 21:59, Dag Wieers ha scritto:

On Fri, 7 Sep 2012, Riccardo Magliocchetti wrote:


i have libreoffice crashing early when running unoconv [1] test suite
(cd tests && make). Attached gdbtrace.log


[snip]


I would recommend using the master branch (which was recently released
as v0.6) it contains a fix for random segmentation faults:

https://github.com/dagwieers/unoconv/commit/781ccca3a928f10e38eaea294af1c294e82efd9f


Since this fix unoconv is amazingly reliable ! This is something that
should be fixed in the UNO python-bindings though.


Thanks, was already running git master. Unfortunately these are most 
probably issues with my crappy code not unoconv issues.


thanks,
riccardo
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] More ::rtl::OUString to OUString and RTL_CONSTASCII in avmed...

2012-09-13 Thread Ricardo Montania (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/610

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/10/610/1

More ::rtl::OUString to OUString and RTL_CONSTASCII in avmedia

Change-Id: I925862289cf5f9f41af5532bbbaf8ec0a4e5a66b
---
M avmedia/source/framework/mediaitem.cxx
M avmedia/source/framework/mediaplayer.cxx
M avmedia/source/framework/mediatoolbox.cxx
3 files changed, 29 insertions(+), 34 deletions(-)


--
To view, visit https://gerrit.libreoffice.org/610
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I925862289cf5f9f41af5532bbbaf8ec0a4e5a66b
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Ricardo Montania 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 44446] LibreOffice 3.6 most annoying bugs

2012-09-13 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=6

Joel Madero  changed:

   What|Removed |Added

 CC||jmadero@gmail.com
 Depends on|54498   |

--- Comment #118 from Joel Madero  2012-09-13 15:32:57 
UTC ---
Nominated 54498
https://bugs.freedesktop.org/show_bug.cgi?id=54498

Crash upon deleting a particular row results in data loss, plus...just really
annoying

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 44446] LibreOffice 3.6 most annoying bugs

2012-09-13 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=6

Joel Madero  changed:

   What|Removed |Added

 Depends on||54498

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [REVIEW:3-6-2] [PATCH] fdo#37529 clear DataColumns read-only information when we cl...

2012-09-13 Thread Miklos Vajna

On Thu, Sep 13, 2012 at 04:38:34PM +0200, Lionel Elie Mamane  
wrote:
> It is (yet another) Base crash. 't would be nice to have it in
> libreoffice-3-6-2, too.

Looks OK to me, one more needed.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] ::rtl::OUString to OUString in avmedia

2012-09-13 Thread Ricardo Montania (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/609

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/09/609/1

::rtl::OUString to OUString in avmedia

Change-Id: If4a7bef339a626fbfa9f0c1cc76801e77626f38f
---
M avmedia/inc/avmedia/mediaitem.hxx
M avmedia/inc/avmedia/mediaplayer.hxx
M avmedia/inc/avmedia/mediawindow.hxx
M avmedia/source/framework/mediacontrol.cxx
4 files changed, 16 insertions(+), 16 deletions(-)


--
To view, visit https://gerrit.libreoffice.org/609
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If4a7bef339a626fbfa9f0c1cc76801e77626f38f
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Ricardo Montania 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [REVIEW:3-5] [PATCH] fdo#37529 clear DataColumns read-only information when we cl...

2012-09-13 Thread Lionel Elie Mamane

On Thu, Sep 13, 2012 at 04:38:34PM +0200, Lionel Elie Mamane wrote:
> On Thu, Sep 13, 2012 at 02:26:02PM +, Lionel Elie Mamane (via Code 
> Review) wrote:

>> To pull it, you can do:

>> git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/08/608/1

>> fdo#37529 clear DataColumns read-only information when we clear DataColumns

>> Change-Id: I6f3b4f1646df1244d97ae98f56ba054bc26e3314

> It is (yet another) Base crash. 't would be nice to have it in
> libreoffice-3-6-2, too.

It applies cleanly to libreoffice-3-5, where I've checked it also
fixes the same crash. Please *also* apply to libreoffice-3-5. Thanks.

The master commit (you can cherry-pick from there) is
522b4c65dcc90719288b4f7aa7eb565c15b64e86

-- 
Lionel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 54157] LibreOffice 3.7 most annoying bugs

2012-09-13 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=54157

Bug 54157 depends on bug 54023, which changed state.

Bug 54023 Summary: CRASH on launch when loading local libiconv.2.dylib 
("liblangtag.0.dylib requires version 8.0.0 or later, but libiconv.2.dylib 
provides version 7.0")
https://bugs.freedesktop.org/show_bug.cgi?id=54023

   What|Old Value   |New Value

 Resolution||FIXED
 Status|NEW |RESOLVED

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED] Change in core[libreoffice-3-6]: fdo#37529 clear DataColumns read-only information when we cl...

2012-09-13 Thread Michael Stahl (via Code Review)

Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/608

Approvals:
  Michael Stahl: Verified; Looks good to me, approved


--
To view, visit https://gerrit.libreoffice.org/608
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6f3b4f1646df1244d97ae98f56ba054bc26e3314
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Lionel Elie Mamane 
Gerrit-Reviewer: Michael Stahl 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - dbaccess/source

2012-09-13 Thread Libreoffice Gerrit user

 dbaccess/source/core/api/RowSet.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 77e0a04561f271d87a14d6a8b6bfe20c93ef7e5d
Author: Lionel Elie Mamane 
Date:   Thu Sep 13 16:24:38 2012 +0200

fdo#37529 clear DataColumns read-only information when we clear DataColumns

Change-Id: I6f3b4f1646df1244d97ae98f56ba054bc26e3314
Reviewed-on: https://gerrit.libreoffice.org/608
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/dbaccess/source/core/api/RowSet.cxx 
b/dbaccess/source/core/api/RowSet.cxx
index afad13c..06a84a8 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -569,6 +569,8 @@ void ORowSet::freeResources( bool _bComplete )
 // the columns must be disposed before the querycomposer is disposed 
because
 // their owner can be the composer
 TDataColumns().swap(m_aDataColumns);// clear and resize capacity
+::std::vector().swap(m_aReadOnlyDataColumns);
+
 m_xColumns  = NULL;
 if ( m_pColumns )
 m_pColumns->disposing();
@@ -1250,6 +1252,7 @@ void ORowSet::impl_setDataColumnsWriteable_throw()
 
 void ORowSet::impl_restoreDataColumnsWriteable_throw()
 {
+assert(m_aDataColumns.size() == m_aReadOnlyDataColumns.size() || 
m_aReadOnlyDataColumns.size() == 0 );
 TDataColumns::iterator aIter = m_aDataColumns.begin();
 ::std::vector >::iterator aReadIter = 
m_aReadOnlyDataColumns.begin();
 for(;aReadIter != m_aReadOnlyDataColumns.end();++aIter,++aReadIter)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[REVIEW:3-6-2] [PATCH] fdo#37529 clear DataColumns read-only information when we cl...

2012-09-13 Thread Lionel Elie Mamane

On Thu, Sep 13, 2012 at 02:26:02PM +, Lionel Elie Mamane (via Code Review) 
wrote:

> To pull it, you can do:

> git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/08/608/1

> fdo#37529 clear DataColumns read-only information when we clear DataColumns

> Change-Id: I6f3b4f1646df1244d97ae98f56ba054bc26e3314

It is (yet another) Base crash. 't would be nice to have it in
libreoffice-3-6-2, too.

-- 
Lionel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: dbaccess/source

2012-09-13 Thread Libreoffice Gerrit user

 dbaccess/source/core/api/RowSet.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 522b4c65dcc90719288b4f7aa7eb565c15b64e86
Author: Lionel Elie Mamane 
Date:   Thu Sep 13 16:24:38 2012 +0200

fdo#37529 clear DataColumns read-only information when we clear DataColumns

Change-Id: I6f3b4f1646df1244d97ae98f56ba054bc26e3314

diff --git a/dbaccess/source/core/api/RowSet.cxx 
b/dbaccess/source/core/api/RowSet.cxx
index 7b21b40..c2e4959 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -558,6 +558,8 @@ void ORowSet::freeResources( bool _bComplete )
 // the columns must be disposed before the querycomposer is disposed 
because
 // their owner can be the composer
 TDataColumns().swap(m_aDataColumns);// clear and resize capacity
+::std::vector().swap(m_aReadOnlyDataColumns);
+
 m_xColumns  = NULL;
 if ( m_pColumns )
 m_pColumns->disposing();
@@ -1239,6 +1241,7 @@ void ORowSet::impl_setDataColumnsWriteable_throw()
 
 void ORowSet::impl_restoreDataColumnsWriteable_throw()
 {
+assert(m_aDataColumns.size() == m_aReadOnlyDataColumns.size() || 
m_aReadOnlyDataColumns.size() == 0 );
 TDataColumns::iterator aIter = m_aDataColumns.begin();
 ::std::vector >::iterator aReadIter = 
m_aReadOnlyDataColumns.begin();
 for(;aReadIter != m_aReadOnlyDataColumns.end();++aIter,++aReadIter)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] Change in core[libreoffice-3-6]: fdo#37529 clear DataColumns read-only information when we cl...

2012-09-13 Thread Lionel Elie Mamane (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/608

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/08/608/1

fdo#37529 clear DataColumns read-only information when we clear DataColumns

Change-Id: I6f3b4f1646df1244d97ae98f56ba054bc26e3314
---
M dbaccess/source/core/api/RowSet.cxx
1 file changed, 3 insertions(+), 0 deletions(-)


--
To view, visit https://gerrit.libreoffice.org/608
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6f3b4f1646df1244d97ae98f56ba054bc26e3314
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Lionel Elie Mamane 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: oox/source

2012-09-13 Thread Libreoffice Gerrit user

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

New commits:
commit 9748670e040e993d66eb777225772e62d0ca2b4e
Author: Muthu Subramanian 
Date:   Thu Sep 13 19:45:48 2012 +0530

fdo#54750: Handle any kind of exception (ooxml import).

This is very similar to fdo#54609 - so changed it to
throw a generic Exception.

diff --git a/oox/source/docprop/ooxmldocpropimport.cxx 
b/oox/source/docprop/ooxmldocpropimport.cxx
index 9e513a2..e620b0f 100644
--- a/oox/source/docprop/ooxmldocpropimport.cxx
+++ b/oox/source/docprop/ooxmldocpropimport.cxx
@@ -68,7 +68,7 @@ Reference< XInterface > SAL_CALL 
DocumentPropertiesImport_createInstance( const
 
 namespace {
 
-Sequence< InputSource > lclGetRelatedStreams( const Reference< XStorage >& 
rxStorage, const OUString& rStreamType ) throw (RuntimeException, 
IllegalArgumentException)
+Sequence< InputSource > lclGetRelatedStreams( const Reference< XStorage >& 
rxStorage, const OUString& rStreamType ) throw (Exception)
 {
 Reference< XRelationshipAccess > xRelation( rxStorage, UNO_QUERY_THROW );
 Reference< XHierarchicalStorageAccess > xHierarchy( rxStorage, 
UNO_QUERY_THROW );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] Change in core[libreoffice-3-6-2]: fdo#42450: fix crash in SwXTextSection::attach:

2012-09-13 Thread Michael Stahl (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/607

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/07/607/1

fdo#42450: fix crash in SwXTextSection::attach:

Inserting the section can fail if the given text range is not valid.

Change-Id: Ib6ba3b02dd581dce08b646b841354073caf894b2
(cherry picked from commit 5bc6c7b2e170a35914d7cd07347c77a9c9d23664
 and commit 2940a697dce2292e9c5b118feb8ec4159e3606fa)
Reviewed-on: https://gerrit.libreoffice.org/602
Reviewed-by: Norbert Thiebaud 
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 
(cherry picked from commit 525127d5b605bf34a8ff0b71f4b169fa7b72c435)
---
M sw/source/core/unocore/unosect.cxx
1 file changed, 8 insertions(+), 0 deletions(-)


--
To view, visit https://gerrit.libreoffice.org/607
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib6ba3b02dd581dce08b646b841354073caf894b2
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6-2
Gerrit-Owner: Michael Stahl 
Gerrit-Reviewer: Miklos Vajna 
Gerrit-Reviewer: Norbert Thiebaud 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Build failure on Mac OSX 10.8.1 in tail_build with liborcus

2012-09-13 Thread Alexander Thurgood

Well, it's nearly there, but the build is still failing in tail_build,
this time with liborcus (again, although that seemed to have gone away
for a while), with :

CXXliborcus_0.2_la-dom_tree.lo
[build CXX] animations/source/animcore/factreg.cxx
  CXXliborcus_0.2_la-exception.lo
  CXXliborcus_0.2_la-global.lo
  CXXliborcus_0.2_la-spreadsheet_interface.lo
  CXXliborcus_0.2_la-orcus_css.lo
../../include/orcus/pstring.hpp: In instantiation of
‘std::basic_ostream<_CharT, _Traits>&
std::operator<<(std::basic_ostream<_CharT, _Traits>&, const
std::basic_string<_CharT, _Traits, _Alloc>&) [with _CharT = char,
_Traits = std::char_traits, _Alloc = std::allocator]’:
../../include/orcus/pstring.hpp:142:   instantiated from here
../../include/orcus/pstring.hpp:142: error: explicit instantiation of
‘std::basic_ostream<_CharT, _Traits>&
std::operator<<(std::basic_ostream<_CharT, _Traits>&, const
std::basic_string<_CharT, _Traits, _Alloc>&) [with _CharT = char,
_Traits = std::char_traits, _Alloc = std::allocator]’ but no
definition available
../../include/orcus/pstring.hpp: In instantiation of
‘std::basic_ostream<_CharT, _Traits>&
std::operator<<(std::basic_ostream<_CharT, _Traits>&, const
std::basic_string<_CharT, _Traits, _Alloc>&) [with _CharT = char,
_Traits = std::char_traits, _Alloc = std::allocator]’:
../../include/orcus/pstring.hpp:142:   instantiated from here
../../include/orcus/pstring.hpp:142: error: explicit instantiation of
‘std::basic_ostream<_CharT, _Traits>&
std::operator<<(std::basic_ostream<_CharT, _Traits>&, const
std::basic_string<_CharT, _Traits, _Alloc>&) [with _CharT = char,
_Traits = std::char_traits, _Alloc = std::allocator]’ but no
definition available
../../include/orcus/pstring.hpp: In instantiation of
‘std::basic_ostream<_CharT, _Traits>&
std::operator<<(std::basic_ostream<_CharT, _Traits>&, const
std::basic_string<_CharT, _Traits, _Alloc>&) [with _CharT = char,
_Traits = std::char_traits, _Alloc = std::allocator]’:
../../include/orcus/pstring.hpp:142:   instantiated from here
../../include/orcus/pstring.hpp:142: error: explicit instantiation of
‘std::basic_ostream<_CharT, _Traits>&
std::operator<<(std::basic_ostream<_CharT, _Traits>&, const
std::basic_string<_CharT, _Traits, _Alloc>&) [with _CharT = char,
_Traits = std::char_traits, _Alloc = std::allocator]’ but no
definition available
make[7]: *** [liborcus_0.2_la-dom_tree.lo] Error 1
make[7]: *** Waiting for unfinished jobs
[build CXX] animations/source/animcore/targetpropertiescreator.cxx
../../include/orcus/pstring.hpp: In instantiation of
‘std::basic_ostream<_CharT, _Traits>&
std::operator<<(std::basic_ostream<_CharT, _Traits>&, const
std::basic_string<_CharT, _Traits, _Alloc>&) [with _CharT = char,
_Traits = std::char_traits, _Alloc = std::allocator]’:
../../include/orcus/pstring.hpp:142:   instantiated from here
../../include/orcus/pstring.hpp:142: error: explicit instantiation of
‘std::basic_ostream<_CharT, _Traits>&
std::operator<<(std::basic_ostream<_CharT, _Traits>&, const
std::basic_string<_CharT, _Traits, _Alloc>&) [with _CharT = char,
_Traits = std::char_traits, _Alloc = std::allocator]’ but no
definition available
../../include/orcus/pstring.hpp: In instantiation of
‘std::basic_ostream<_CharT, _Traits>&
std::operator<<(std::basic_ostream<_CharT, _Traits>&, const
std::basic_string<_CharT, _Traits, _Alloc>&) [with _CharT = char,
_Traits = std::char_traits, _Alloc = std::allocator]’:
../../include/orcus/pstring.hpp:142:   instantiated from here
../../include/orcus/pstring.hpp:142: error: explicit instantiation of
‘std::basic_ostream<_CharT, _Traits>&
std::operator<<(std::basic_ostream<_CharT, _Traits>&, const
std::basic_string<_CharT, _Traits, _Alloc>&) [with _CharT = char,
_Traits = std::char_traits, _Alloc = std::allocator]’ but no
definition available
../../include/orcus/pstring.hpp: In instantiation of
‘std::basic_ostream<_CharT, _Traits>&
std::operator<<(std::basic_ostream<_CharT, _Traits>&, const
std::basic_string<_CharT, _Traits, _Alloc>&) [with _CharT = char,
_Traits = std::char_traits, _Alloc = std::allocator]’:
../../include/orcus/pstring.hpp:142:   instantiated from here
../../include/orcus/pstring.hpp:142: error: explicit instantiation of
‘std::basic_ostream<_CharT, _Traits>&
std::operator<<(std::basic_ostream<_CharT, _Traits>&, const
std::basic_string<_CharT, _Traits, _Alloc>&) [with _CharT = char,
_Traits = std::char_traits, _Alloc = std::allocator]’ but no
definition available
make[7]: *** [liborcus_0.2_la-global.lo] Error 1
[build CXX] xmlscript/source/misc/unoservices.cxx
[build CXX] xmlscript/source/xml_helper/xml_byteseq.cxx
../../include/orcus/pstring.hpp: In instantiation of
‘std::basic_ostream<_CharT, _Traits>&
std::operator<<(std::basic_ostream<_CharT, _Traits>&, const
std::basic_string<_CharT, _Traits, _Alloc>&) [with _CharT = char,
_Traits = std::char_traits, _Alloc = std::allocator]’:
../../include/orcus/pstring.hpp:142:   instantiated from here
../../include/orcus/pstring.hpp:142:

Re: [PATCH] fdo#54843 righthyphenmin fix (patch by Steven Dickson)

2012-09-13 Thread Németh László

Hi,

Additions to the previous automatic message:

I have checked the result of this 3-line hyphenation patch (sent by
Steven Dickson)

– on 2 million Hungarian words (there is no difference in the
hyphenation, because it only affects the hyphenation of the words with
3-byte or longer UTF-8 multibyte characters),

– on the Telugu test document attached to the fdo#54843
(https://bugs.freedesktop.org/show_bug.cgi?id=54843) (it fixes its
hyphenation problems).

Best regards,
László

2012/9/13 Németh László (via Code Review) :
> Hi,
>
> I have submitted a patch for review:
>
> https://gerrit.libreoffice.org/606
>
> To pull it, you can do:
>
> git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/06/606/1
>
> fdo#54843 righthyphenmin fix (patch by Steven Dickson)
>
> Change-Id: I42747dffef099f3806178af76e20335f5f033379
> ---
> A hyphen/hyphen-rhmin.patch
> M hyphen/makefile.mk
> 2 files changed, 29 insertions(+), 1 deletion(-)
>
>
> --
> To view, visit https://gerrit.libreoffice.org/606
> To unsubscribe, visit https://gerrit.libreoffice.org/settings
>
> Gerrit-MessageType: newchange
> Gerrit-Change-Id: I42747dffef099f3806178af76e20335f5f033379
> Gerrit-PatchSet: 1
> Gerrit-Project: core
> Gerrit-Branch: master
> Gerrit-Owner: Németh László 
>
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2012-09-13 Thread Libreoffice Gerrit user

 oox/inc/oox/ole/vbacontrol.hxx  |9 -
 oox/inc/oox/ole/vbamodule.hxx   |   10 -
 oox/source/ole/axcontrol.cxx|2 
 oox/source/ole/vbacontrol.cxx   |  308 +---
 oox/source/ole/vbamodule.cxx|9 -
 oox/source/ole/vbaproject.cxx   |5 
 sc/source/ui/unoobj/addruno.cxx |   12 -
 vcl/inc/vcl/tabctrl.hxx |1 
 vcl/source/control/group.cxx|1 
 vcl/source/control/tabctrl.cxx  |   16 --
 10 files changed, 158 insertions(+), 215 deletions(-)

New commits:
commit a6c18caef16b9eb0742c2a2cbb724e66bb31c3c3
Author: Noel Power 
Date:   Thu Sep 13 12:49:08 2012 +0100

targetted container_controls rework.

diff --git a/oox/inc/oox/ole/vbacontrol.hxx b/oox/inc/oox/ole/vbacontrol.hxx
index e3c9421..8c56ac6 100644
--- a/oox/inc/oox/ole/vbacontrol.hxx
+++ b/oox/inc/oox/ole/vbacontrol.hxx
@@ -158,7 +158,13 @@ private:
 /** Imports the site models of all embedded controls from the 'f' stream. 
*/
 boolimportEmbeddedSiteModels( BinaryInputStream& rInStrm );
 /*  Final processing of all embedded controls after import. */
-voidfinalizeEmbeddedControls( StorageBase& rStrg );
+voidfinalizeEmbeddedControls();
+
+/** Moves the control relative to its current position by the passed 
distance. */
+voidmoveRelative( const AxPairData& rDistance );
+/** Moves all embedded controls from their relative position in this
+control to an absolute position in the parent of this control. */
+voidmoveEmbeddedToAbsoluteParent();
 
 /** Functor for comparing controls by their tab index. */
 static bool compareByTabIndex( const VbaFormControlRef& rxLeft, 
const VbaFormControlRef& rxRight );
@@ -186,7 +192,6 @@ public:
 /** Imports the form and its embedded controls, and inserts the form with
 all its controls into the passed dialog library. */
 voidimportForm(
-   const ::com::sun::star::uno::Reference< 
::com::sun::star::frame::XModel >& rxDocModel,
const ::com::sun::star::uno::Reference< 
::com::sun::star::container::XNameContainer >& rxDialogLib,
StorageBase& rVbaFormStrg,
const ::rtl::OUString& rModuleName,
diff --git a/oox/inc/oox/ole/vbamodule.hxx b/oox/inc/oox/ole/vbamodule.hxx
index 14195d9..65cd41a 100644
--- a/oox/inc/oox/ole/vbamodule.hxx
+++ b/oox/inc/oox/ole/vbamodule.hxx
@@ -67,21 +67,17 @@ public:
 voidcreateAndImportModule(
 StorageBase& rVbaStrg,
 const ::com::sun::star::uno::Reference< 
::com::sun::star::container::XNameContainer >& rxBasicLib,
-const ::com::sun::star::uno::Reference< 
::com::sun::star::container::XNameAccess >& rxDocObjectNA,
-const ::com::sun::star::uno::Reference< 
::com::sun::star::container::XNameContainer >& rxOleNameOverrides ) const;
+const ::com::sun::star::uno::Reference< 
::com::sun::star::container::XNameAccess >& rxDocObjectNA ) const;
 /** Creates an empty Basic module in the passed Basic library. */
 voidcreateEmptyModule(
 const ::com::sun::star::uno::Reference< 
::com::sun::star::container::XNameContainer >& rxBasicLib,
 const ::com::sun::star::uno::Reference< 
::com::sun::star::container::XNameAccess >& rxDocObjectNA ) const;
 
 private:
-/** Reads and returns the VBA source code from the passed storage. */
-::rtl::OUString readSourceCode(
-StorageBase& rVbaStrg,
-const ::com::sun::star::uno::Reference< 
::com::sun::star::container::XNameContainer >& rxOleNameOverrides ) const;
-
 void extractOleOverrideFromAttr( const rtl::OUString& rAttribute,
  const ::com::sun::star::uno::Reference< 
::com::sun::star::container::XNameContainer >& rxOleNameOverrides ) const;
+/** Reads and returns the VBA source code from the passed storage. */
+::rtl::OUString readSourceCode( StorageBase& rVbaStrg ) const;
 
 /** Creates a new Basic module and inserts it into the passed Basic 
library. */
 voidcreateModule(
diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx
index 3ec46c8..0190f7f 100644
--- a/oox/source/ole/axcontrol.cxx
+++ b/oox/source/ole/axcontrol.cxx
@@ -625,7 +625,7 @@ OUString ControlModelBase::getServiceName() const
 case API_CONTROL_SPINBUTTON:return CREATE_OUSTRING( 
"com.sun.star.form.component.SpinButton" );
 case API_CONTROL_SCROLLBAR: return CREATE_OUSTRING( 
"com.sun.star.form.component.ScrollBar" );
 case API_CONTROL_PROGRESSBAR:   return CREATE_OUSTRING( 
"com.sun.star.awt.UnoControlProgressBarModel" );
-cas

[Libreoffice-commits] .: helpcontent2/source

2012-09-13 Thread Libreoffice Gerrit user

 helpcontent2/source/text/sbasic/shared/03090101.xhp |   30 ++--
 1 file changed, 15 insertions(+), 15 deletions(-)

New commits:
commit e9f3bd2782afcd2dc1c89593c98891a06f6d40d6
Author: Andras Timar 
Date:   Thu Sep 13 13:52:06 2012 +0200

change paragraph role to 'code' for Basic code

Change-Id: I2d8b4a062858678561c6808f106a29035b144794

diff --git a/helpcontent2/source/text/sbasic/shared/03090101.xhp 
b/helpcontent2/source/text/sbasic/shared/03090101.xhp
index 409372d..120c345 100644
--- a/helpcontent2/source/text/sbasic/shared/03090101.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03090101.xhp
@@ -56,20 +56,20 @@
 You can use GoTo and GoSub to jump out of 
an If...Then block, but not to jump into an If...Then 
structure.
 The following example enables you to enter the expiration date of a 
product, and determines if the expiration date has passed.
 Example:
-Sub ExampleIfThenDate
-Dim sDate as String
-Dim sToday as String
-sDate = InputBox("Enter the expiration date 
(MM.DD.)")
-sDate = Right$(sDate, 4) + Mid$(sDate, 4, 2) + Left$(sDate, 
2)
-sToday = Date$
-sToday = Right$(sToday, 4)+ Mid$(sToday, 4, 2) + Left$(sToday, 
2)
-If sDate < sToday Then
-MsgBox "The expiration date has passed"
-ElseIf sDate > sToday Then
-MsgBox "The expiration date has not yet passed"
-Else
-MsgBox "The expiration date is today"
-End If
-End Sub
+Sub ExampleIfThenDate
+Dim sDate as String
+Dim sToday as String
+sDate = InputBox("Enter the expiration date 
(MM.DD.)")
+sDate = Right$(sDate, 4) + Mid$(sDate, 4, 2) + Left$(sDate, 
2)
+sToday = Date$
+sToday = Right$(sToday, 4)+ Mid$(sToday, 4, 2) + Left$(sToday, 
2)
+If sDate < sToday Then
+MsgBox "The expiration date has passed"
+ElseIf sDate > sToday Then
+MsgBox "The expiration date has not yet passed"
+Else
+MsgBox "The expiration date is today"
+End If
+End Sub
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 37361] LibreOffice 3.5 most annoying bugs

2012-09-13 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=37361

Bug 37361 depends on bug 39007, which changed state.

Bug 39007 Summary: Persistent "Restore Windows" dialog won't disappear, 
disables key functionality
https://bugs.freedesktop.org/show_bug.cgi?id=39007

   What|Old Value   |New Value

 Resolution||FIXED
 Status|NEW |RESOLVED

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

About fdo 47368 [Task] Many crashes when accessibility enabled on MacOS X

2012-09-13 Thread julien2412

Hello,

About fdo 47368, [Task] Many crashes when accessibility enabled on MacOS X
(cf https://bugs.freedesktop.org/show_bug.cgi?id=47368), should I reopen all
the bugtrackers that I had put as a dup or should I let them as they are?

Julien



--
View this message in context: 
http://nabble.documentfoundation.org/About-fdo-47368-Task-Many-crashes-when-accessibility-enabled-on-MacOS-X-tp4007227.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: vcl/aqua

2012-09-13 Thread Libreoffice Gerrit user

 vcl/aqua/source/window/salframe.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 41747c962603222b2d6221a9f5fca28cd71c103a
Author: Norbert Thiebaud 
Date:   Thu Sep 13 05:13:26 2012 -0500

fdo#39007 make windows not 'restorable'

Change-Id: I9473800820cb863e0de4b16f633deec951dee120

diff --git a/vcl/aqua/source/window/salframe.cxx 
b/vcl/aqua/source/window/salframe.cxx
index a80ff4e..b427e2e 100644
--- a/vcl/aqua/source/window/salframe.cxx
+++ b/vcl/aqua/source/window/salframe.cxx
@@ -222,6 +222,10 @@ void AquaSalFrame::initWindowAndView()
 // do this:
 objc_msgSend(mpWindow, @selector(setDelegate:), mpWindow);
 
+if( [mpWindow respondsToSelector: @selector(setRestorable:)])
+{
+objc_msgSend(mpWindow, @selector(setRestorable:), NO);
+}
 NSRect aRect = { { 0,0 }, { maGeometry.nWidth, maGeometry.nHeight } };
 mnTrackingRectTag = [mpView addTrackingRect: aRect owner: mpView userData: 
nil assumeInside: NO];
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - binfilter/bf_sc binfilter/bf_sw

2012-09-13 Thread Libreoffice Gerrit user

 binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx   |4 ++--
 binfilter/bf_sw/source/core/swg/sw_rdfmts.cxx |2 +-
 binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx |2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 6d81663a63d209db10fc67d875e054b27d7e45b8
Author: Stephan Bergmann 
Date:   Thu Sep 13 13:35:07 2012 +0200

-Werror,-Wsometimes-uninitialized

Change-Id: Id0bcdba15ebb278de1af8b782c906765aaa2900b

diff --git a/binfilter/bf_sw/source/core/swg/sw_rdfmts.cxx 
b/binfilter/bf_sw/source/core/swg/sw_rdfmts.cxx
index 881931e..596bfac 100644
--- a/binfilter/bf_sw/source/core/swg/sw_rdfmts.cxx
+++ b/binfilter/bf_sw/source/core/swg/sw_rdfmts.cxx
@@ -191,7 +191,7 @@ SwFmt* SwSwgReader::InFormat( SwFmt* pFmt, USHORT* 
pParentId )
 BYTE nHelpFid = (BYTE) nHelpFileId;
 USHORT nHelpId = USHRT_MAX;
 BYTE cFlags;
-USHORT nFmtId;
+USHORT nFmtId(IDX_NO_VALUE);
 if( cFmtKind == SWG_FLYFMT ) nFlyLevel++;
 nFmtLvl++;
 
commit 956cf66cda7b89838f0979cc12025d88757576f4
Author: Stephan Bergmann 
Date:   Thu Sep 13 13:34:22 2012 +0200

-Werror,-Wunused-value

Change-Id: I1c898a6b3547be0aae5e82cd095ecdcb92bba7ce

diff --git a/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx 
b/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx
index 0441b17..d9cd6e6 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx
@@ -412,7 +412,7 @@ static const sal_Char pFilterRtf[]  = "Rich Text Format 
(StarCalc)";
 /*N*/ {
 /*N*/   RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "nn93723", "ScDocShell::Load" 
);
 /*N*/
-/*N*/   ScRefreshTimerProtector( aDocument.GetRefreshTimerControlAddress() );
+/*N*/   ScRefreshTimerProtector aProt( 
aDocument.GetRefreshTimerControlAddress() );
 /*N*/
 /*N*/   DBG_ASSERT( pStor, "Load without storage?" );
 /*N*/   BOOL bXML = ( pStor->GetVersion() >= SOFFICE_FILEFORMAT_60 );
@@ -486,7 +486,7 @@ static const sal_Char pFilterRtf[]  = "Rich Text Format 
(StarCalc)";
 /*N*/   BOOL bRet = FALSE;  // FALSE heisst Benutzerabbruch !!
 /*N*/   // bei Fehler: Fehler am Stream 
setzen!!
 /*N*/
-/*N*/   ScRefreshTimerProtector( aDocument.GetRefreshTimerControlAddress() );
+/*N*/   ScRefreshTimerProtector aProt( 
aDocument.GetRefreshTimerControlAddress() );
 /*N*/
 /*N*/   // ob nach dem Import optimale Spaltenbreiten gesetzt werden sollen
 /*N*/   BOOL bSetColWidths = FALSE;
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx 
b/binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx
index 95cf3c8..7bd0149 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx
@@ -2813,7 +2813,7 @@ void SwXTextTable::setPropertyValue(const OUString& 
rPropertyName,
 break;
 case FN_UNO_TABLE_COLUMN_SEPARATORS:
 {
-UnoActionContext(pFmt->GetDoc());
+UnoActionContext aContext(pFmt->GetDoc());
 lcl_SetTblSeparators(aValue, sal_False);
 }
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: connectivity/source

2012-09-13 Thread Libreoffice Gerrit user

 connectivity/source/drivers/kab/KDatabaseMetaData.hxx  |2 --
 connectivity/source/drivers/kab/KPreparedStatement.cxx |2 +-
 connectivity/source/drivers/kab/KResultSet.cxx |5 ++---
 connectivity/source/drivers/kab/KResultSet.hxx |3 +++
 connectivity/source/drivers/kab/KResultSetMetaData.cxx |4 +---
 connectivity/source/drivers/kab/KResultSetMetaData.hxx |4 +---
 connectivity/source/drivers/kab/KStatement.cxx |4 +---
 connectivity/source/drivers/kab/KStatement.hxx |3 ---
 8 files changed, 9 insertions(+), 18 deletions(-)

New commits:
commit 65006ffb0baec2efb06ff7eac59bbef50d232eb6
Author: Stephan Bergmann 
Date:   Thu Sep 13 13:32:27 2012 +0200

-Werror,-Wunused-private-field (connectivity/source/drivers/kab)

...and some related clean up.

Change-Id: I26a8720fb7f60615f2e348e4728a3abddf6a33cd

diff --git a/connectivity/source/drivers/kab/KDatabaseMetaData.hxx 
b/connectivity/source/drivers/kab/KDatabaseMetaData.hxx
index c3d4fe7..0e3787b 100644
--- a/connectivity/source/drivers/kab/KDatabaseMetaData.hxx
+++ b/connectivity/source/drivers/kab/KDatabaseMetaData.hxx
@@ -41,8 +41,6 @@ namespace connectivity
 
 public:
 
-inline KabConnection* getOwnConnection() const { return 
m_xConnection.get(); }
-
 KabDatabaseMetaData(KabConnection* _pCon);
 static const ::rtl::OUString & getAddressBookTableName();
 virtual ~KabDatabaseMetaData();
diff --git a/connectivity/source/drivers/kab/KPreparedStatement.cxx 
b/connectivity/source/drivers/kab/KPreparedStatement.cxx
index 26167b3..be7efa0 100644
--- a/connectivity/source/drivers/kab/KPreparedStatement.cxx
+++ b/connectivity/source/drivers/kab/KPreparedStatement.cxx
@@ -115,7 +115,7 @@ Reference< XResultSetMetaData > SAL_CALL 
KabPreparedStatement::getMetaData() thr
 
 if (!m_xMetaData.is())
 {
-m_xMetaData = new KabResultSetMetaData(getOwnConnection());
+m_xMetaData = new KabResultSetMetaData;
 setKabFields();
 }
 Reference< XResultSetMetaData > xMetaData = m_xMetaData.get();
diff --git a/connectivity/source/drivers/kab/KResultSet.cxx 
b/connectivity/source/drivers/kab/KResultSet.cxx
index 31bed0f..5841932 100644
--- a/connectivity/source/drivers/kab/KResultSet.cxx
+++ b/connectivity/source/drivers/kab/KResultSet.cxx
@@ -329,8 +329,7 @@ DateTime SAL_CALL KabResultSet::getTimestamp(sal_Int32 
columnIndex) throw(SQLExc
 
 if (m_nRowPos != -1 && m_nRowPos != nAddressees && m_xMetaData.is())
 {
-KabResultSetMetaData *pMeta = static_cast(m_xMetaData.get());
-sal_Int32 nFieldNumber = pMeta->fieldAtColumn(columnIndex);
+sal_Int32 nFieldNumber = m_xMetaData->fieldAtColumn(columnIndex);
 
 if (nFieldNumber == KAB_FIELD_REVISION)
 {
@@ -435,7 +434,7 @@ Reference< XResultSetMetaData > SAL_CALL 
KabResultSet::getMetaData() throw(SQLEx
 checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
 
 if (!m_xMetaData.is())
-m_xMetaData = new 
KabResultSetMetaData(m_xStatement->getOwnConnection());
+m_xMetaData = new KabResultSetMetaData;
 
 Reference< XResultSetMetaData > xMetaData = m_xMetaData.get();
 return xMetaData;
diff --git a/connectivity/source/drivers/kab/KResultSet.hxx 
b/connectivity/source/drivers/kab/KResultSet.hxx
index 7a90333..c6413b8 100644
--- a/connectivity/source/drivers/kab/KResultSet.hxx
+++ b/connectivity/source/drivers/kab/KResultSet.hxx
@@ -102,6 +102,9 @@ namespace connectivity
 void someKabAddressees(const class KabCondition *pCondition);
 void sortKabAddressees(const class KabOrder *pOrder);
 
+::rtl::Reference< KabResultSetMetaData > getKabMetaData() const
+{ return m_xMetaData; }
+
 // ::cppu::OComponentHelper
 virtual void SAL_CALL disposing(void);
 
diff --git a/connectivity/source/drivers/kab/KResultSetMetaData.cxx 
b/connectivity/source/drivers/kab/KResultSetMetaData.cxx
index 2ed2fae..14fc352 100644
--- a/connectivity/source/drivers/kab/KResultSetMetaData.cxx
+++ b/connectivity/source/drivers/kab/KResultSetMetaData.cxx
@@ -28,9 +28,7 @@ using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::sdbc;
 
-KabResultSetMetaData::KabResultSetMetaData(KabConnection* _pConnection)
-: m_pConnection(_pConnection),
-  m_aKabFields()
+KabResultSetMetaData::KabResultSetMetaData()
 {
 }
 // -
diff --git a/connectivity/source/drivers/kab/KResultSetMetaData.hxx 
b/connectivity/source/drivers/kab/KResultSetMetaData.hxx
index 5e91e49..4738106 100644
--- a/connectivity/source/drivers/kab/KResultSetMetaData.hxx
+++ b/connectivity/source/drivers/kab/KResultSetMetaData.hxx
@@ -20,7 +20,6 @@
 #ifndef _CONNECTIVITY_KAB_RESULTSETMETADATA_HXX_
 #define _CONNECTIVITY_KAB_RESULTSETMETADATA_HXX_
 
-#include "KConnection.hxx"
 #i

[Bug 44446] LibreOffice 3.6 most annoying bugs

2012-09-13 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=6

Fridrich Strba  changed:

   What|Removed |Added

 Depends on||54859

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 44446] LibreOffice 3.6 most annoying bugs

2012-09-13 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=6

Fridrich Strba  changed:

   What|Removed |Added

 Depends on|54859   |

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 44446] LibreOffice 3.6 most annoying bugs

2012-09-13 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=6

Fridrich Strba  changed:

   What|Removed |Added

 Depends on||54859

--- Comment #117 from Fridrich Strba  2012-09-13 
11:08:02 UTC ---
Really, really, really annoying bug!
https://bugs.freedesktop.org/show_bug.cgi?id=54859

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: basic/inc

2012-09-13 Thread Libreoffice Gerrit user

 basic/inc/basic/sbmod.hxx|2 --
 basic/inc/basic/sbobjmod.hxx |2 --
 basic/inc/basic/sbprop.hxx   |2 --
 basic/inc/basic/sbxmeth.hxx  |3 ---
 4 files changed, 9 deletions(-)

New commits:
commit 7580802e9f47aa42db5fa7e19e3ee6f33ba886ca
Author: Takeshi Abe 
Date:   Thu Sep 13 18:27:08 2012 +0900

Remove unused reference class

Change-Id: I17246e036e821c4a8be36cf322dcf23285e3d97a

diff --git a/basic/inc/basic/sbmod.hxx b/basic/inc/basic/sbmod.hxx
index 2f49472..464ebf2 100644
--- a/basic/inc/basic/sbmod.hxx
+++ b/basic/inc/basic/sbmod.hxx
@@ -164,8 +164,6 @@ public:
 void triggerTerminateEvent( void );
 };
 
-SV_DECL_IMPL_REF(SbClassModuleObject);
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/inc/basic/sbobjmod.hxx b/basic/inc/basic/sbobjmod.hxx
index 10c8714..b3ff31f 100644
--- a/basic/inc/basic/sbobjmod.hxx
+++ b/basic/inc/basic/sbobjmod.hxx
@@ -101,8 +101,6 @@ public:
 virtual SbxVariable* Find( const rtl::OUString& rName, SbxClassType t );
 };
 
-SV_DECL_IMPL_REF(SbObjModule);
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/inc/basic/sbprop.hxx b/basic/inc/basic/sbprop.hxx
index beeaf66..3e66f7e 100644
--- a/basic/inc/basic/sbprop.hxx
+++ b/basic/inc/basic/sbprop.hxx
@@ -62,8 +62,6 @@ public:
 { mbSet = bSet; }
 };
 
-SV_DECL_IMPL_REF(SbProcedureProperty)
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/inc/basic/sbxmeth.hxx b/basic/inc/basic/sbxmeth.hxx
index 9666c93..3bdde98 100644
--- a/basic/inc/basic/sbxmeth.hxx
+++ b/basic/inc/basic/sbxmeth.hxx
@@ -35,9 +35,6 @@ public:
 virtual SbxClassType GetClass() const;
 };
 
-SV_DECL_REF(SbxMethod)
-SV_IMPL_REF(SbxMethod)
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] Change in core[libreoffice-3-5]: fdo#42450: fix crash in SwXTextSection::attach:

2012-09-13 Thread Miklos Vajna (via Code Review)

Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/604

Approvals:
  Miklos Vajna: Verified; Looks good to me, approved
  Norbert Thiebaud: Looks good to me, approved


--
To view, visit https://gerrit.libreoffice.org/604
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib6ba3b02dd581dce08b646b841354073caf894b2
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-5
Gerrit-Owner: Michael Stahl 
Gerrit-Reviewer: Miklos Vajna 
Gerrit-Reviewer: Norbert Thiebaud 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sw/source

2012-09-13 Thread Libreoffice Gerrit user

 sw/source/core/unocore/unosect.cxx |8 
 1 file changed, 8 insertions(+)

New commits:
commit d026212d51cd7fe0dbcfe3a28bd15675528723ff
Author: Michael Stahl 
Date:   Wed Sep 12 21:01:41 2012 +0200

fdo#42450: fix crash in SwXTextSection::attach:

Inserting the section can fail if the given text range is not valid.

(cherry picked from commit 5bc6c7b2e170a35914d7cd07347c77a9c9d23664
 and commit 2940a697dce2292e9c5b118feb8ec4159e3606fa)

Change-Id: Ib6ba3b02dd581dce08b646b841354073caf894b2
Reviewed-on: https://gerrit.libreoffice.org/604
Reviewed-by: Norbert Thiebaud 
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/sw/source/core/unocore/unosect.cxx 
b/sw/source/core/unocore/unosect.cxx
index 1524d82..729ce0d 100644
--- a/sw/source/core/unocore/unosect.cxx
+++ b/sw/source/core/unocore/unosect.cxx
@@ -399,6 +399,14 @@ throw (lang::IllegalArgumentException, 
uno::RuntimeException)
 
 SwSection *const pRet =
 pDoc->InsertSwSection( aPam, aSect, 0, aSet.Count() ? &aSet : 0 );
+if (!pRet) // fdo#42450 text range could parially overlap existing section
+{
+// shouldn't have created an undo object yet
+pDoc->GetIDocumentUndoRedo().EndUndo( UNDO_INSSECTION, NULL );
+throw lang::IllegalArgumentException(
+::rtl::OUString::createFromAscii("SwXTextSection::attach(): 
invalid TextRange"),
+static_cast< ::cppu::OWeakObject*>(this), 0);
+}
 pRet->GetFmt()->Add(m_pImpl.get());
 pRet->GetFmt()->SetXObject(static_cast< ::cppu::OWeakObject*>(this));
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [libreoffice-commits] Hopefully this is the last of the cleanups for class ScDocument for now.

2012-09-13 Thread Stephan Bergmann


The changes of


commit 872daba66c4be77c9df9d6fe6a1c501abe087d04
Author: Joseph Powers 
Date:   Thu Sep 8 21:05:58 2011 -0700

Hopefully this is the last of the cleanups for class ScDocument for now.


to


diff --git a/binfilter/bf_sc/source/filter/xml/sc_XMLExportDDELinks.cxx 
b/binfilter/bf_sc/source/filter/xml/sc_XMLExportDDELinks.cxx
index 343668d..3100f23 100644
--- a/binfilter/bf_sc/source/filter/xml/sc_XMLExportDDELinks.cxx
+++ b/binfilter/bf_sc/source/filter/xml/sc_XMLExportDDELinks.cxx
@@ -132,15 +132,13 @@ void ScXMLExportDDELinks::WriteTable(const sal_Int32 nPos)
 for(sal_Int32 nColumn = 0; nColumn < nColCount; nColumn++)
 {
 if (nColumn == 0)
-bPrevEmpty = rExport.GetDocument()->GetDdeLinkResult(pMatrix, 
static_cast(nColumn), static_cast(nRow),
-
sPrevValue, fPrevValue, bPrevString);
+bPrevEmpty = TRUE;
 else
 {
 double fValue;
 String sValue;
 sal_Bool bString(sal_True);
-sal_Bool bEmpty = rExport.GetDocument()->GetDdeLinkResult(pMatrix, 
static_cast(nColumn), static_cast(nRow),
-
sValue, fValue, bString);
+sal_Bool bEmpty = TRUE;
 if (CellsEqual(bPrevEmpty, bPrevString, sPrevValue, 
fPrevValue,
 bEmpty, bString, sValue, fValue))
 nRepeatColsCount++;


causes a warning now that fValue is uninitialized in the assignment

  fPrevValue = fValue;

(in code below the code shown above).  From bPrevString, bPrevEmpy, 
bString, and bEmpty always being true, it looks like fPrevValue and 
fValue have become unused anyway, but it looks a little suspicious to me 
that this code has degraded now to a glorious way of repeatedly calling 
WriteCell to only ever write empty cells.  I know too little about this 
area to tell whether this is as intended or got broken.  (And the 
respective code in sc/source/filter/xml/XMLExportDDELinks.cxx has 
diverted sufficiently by now to prevent direct comparison.)


Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED] Change in core[libreoffice-3-6]: fdo#42450: fix crash in SwXTextSection::attach:

2012-09-13 Thread Miklos Vajna (via Code Review)

Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/602

Approvals:
  Miklos Vajna: Verified; Looks good to me, approved
  Norbert Thiebaud: Looks good to me, approved


--
To view, visit https://gerrit.libreoffice.org/602
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib6ba3b02dd581dce08b646b841354073caf894b2
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Michael Stahl 
Gerrit-Reviewer: Michael Stahl 
Gerrit-Reviewer: Miklos Vajna 
Gerrit-Reviewer: Norbert Thiebaud 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sw/source

2012-09-13 Thread Libreoffice Gerrit user

 sw/source/core/unocore/unosect.cxx |8 
 1 file changed, 8 insertions(+)

New commits:
commit 525127d5b605bf34a8ff0b71f4b169fa7b72c435
Author: Michael Stahl 
Date:   Wed Sep 12 21:01:41 2012 +0200

fdo#42450: fix crash in SwXTextSection::attach:

Inserting the section can fail if the given text range is not valid.

Change-Id: Ib6ba3b02dd581dce08b646b841354073caf894b2
(cherry picked from commit 5bc6c7b2e170a35914d7cd07347c77a9c9d23664
 and commit 2940a697dce2292e9c5b118feb8ec4159e3606fa)
Reviewed-on: https://gerrit.libreoffice.org/602
Reviewed-by: Norbert Thiebaud 
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/sw/source/core/unocore/unosect.cxx 
b/sw/source/core/unocore/unosect.cxx
index 338c376..9e3ba6b 100644
--- a/sw/source/core/unocore/unosect.cxx
+++ b/sw/source/core/unocore/unosect.cxx
@@ -400,6 +400,14 @@ throw (lang::IllegalArgumentException, 
uno::RuntimeException)
 
 SwSection *const pRet =
 pDoc->InsertSwSection( aPam, aSect, 0, aSet.Count() ? &aSet : 0 );
+if (!pRet) // fdo#42450 text range could parially overlap existing section
+{
+// shouldn't have created an undo object yet
+pDoc->GetIDocumentUndoRedo().EndUndo( UNDO_INSSECTION, NULL );
+throw lang::IllegalArgumentException(
+"SwXTextSection::attach(): invalid TextRange",
+static_cast< ::cppu::OWeakObject*>(this), 0);
+}
 pRet->GetFmt()->Add(m_pImpl.get());
 pRet->GetFmt()->SetXObject(static_cast< ::cppu::OWeakObject*>(this));
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/qa

2012-09-13 Thread Libreoffice Gerrit user

 sw/qa/extras/ooxmlimport/data/n778836.docx |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx   |   15 +++
 2 files changed, 15 insertions(+)

New commits:
commit 601e7d4f5e2966ae3167de5ef09dc1e0252f55e8
Author: Miklos Vajna 
Date:   Thu Sep 13 12:08:34 2012 +0200

n#778836 testcase

Change-Id: I0b6fbeff5d784e0e3f2067111cf505904f263844

diff --git a/sw/qa/extras/ooxmlimport/data/n778836.docx 
b/sw/qa/extras/ooxmlimport/data/n778836.docx
new file mode 100644
index 000..ccd89e8
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/n778836.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index ec61993..b66b5b8 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -89,6 +89,7 @@ public:
 void testN775899();
 void testN777345();
 void testN777337();
+void testN778836();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX) && !defined(WNT)
@@ -120,6 +121,7 @@ public:
 CPPUNIT_TEST(testN775899);
 CPPUNIT_TEST(testN777345);
 CPPUNIT_TEST(testN777337);
+CPPUNIT_TEST(testN778836);
 #endif
 CPPUNIT_TEST_SUITE_END();
 
@@ -801,6 +803,19 @@ void Test::testN777337()
 CPPUNIT_ASSERT_EQUAL(sal_Int32(1702), getProperty(xPropertySet, 
"BottomMargin"));
 }
 
+void Test::testN778836()
+{
+/*
+ * The problem was that the paragraph inherited margins from the numbering
+ * and parent paragraph styles and the result was incorrect.
+ */
+load("n778836.docx");
+
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1270), 
getProperty(getParagraph(0), "ParaRightMargin"));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(3810), 
getProperty(getParagraph(0), "ParaLeftMargin"));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(-635), 
getProperty(getParagraph(0), "ParaFirstLineIndent"));
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Build failure in tail build on Mac OSX - postgres driver the culprit ?

2012-09-13 Thread Alexander Thurgood

Le 12/09/12 23:57, Caolán McNamara a écrit :

Hi Caolán,


 843c83f6405ab4f1a4f7734ec66f2b62248f4e34 possibly helps bump along to
> the next such warning-as-error. Can obviously turn off --enable-werror
> FWIW.
> 

You were right about the bump, next such to be found in pg_tools.cxx,
lines 444, 450, 455, 462 and 465.

My concern is that if I turn off -enable-werror, and assuming I get a
complete build out of it, what incidence will that have on my attempts
to debug some of the database connectivity problems on Mac ?


Alex

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2012-09-13 Thread Libreoffice Gerrit user

 svx/inc/svx/svdundo.hxx   |3 +++
 svx/source/svdraw/svdundo.cxx |4 
 2 files changed, 7 insertions(+)

New commits:
commit b8329bde87089c4d44a48632dd205e157cc0b204
Author: Stephan Bergmann 
Date:   Thu Sep 13 11:41:16 2012 +0200

Hide dtor details behind SVX_DLLPUBLIC

Change-Id: I442e114322d2a70fbfbdaa2aa197146c0cffa4bd

diff --git a/svx/inc/svx/svdundo.hxx b/svx/inc/svx/svdundo.hxx
index 5451441..4c13737 100644
--- a/svx/inc/svx/svdundo.hxx
+++ b/svx/inc/svx/svdundo.hxx
@@ -72,6 +72,8 @@ protected:
 
 public:
 TYPEINFO();
+virtual ~SdrUndoAction();
+
 virtual sal_Bool CanRepeat(SfxRepeatTarget& rView) const;
 virtual void Repeat(SfxRepeatTarget& rView);
 
@@ -210,6 +212,7 @@ protected:
 public:
 SdrUndoMoveObj(SdrObject& rNewObj): SdrUndoObj(rNewObj) {}
 SdrUndoMoveObj(SdrObject& rNewObj, const Size& rDist): 
SdrUndoObj(rNewObj),aDistance(rDist) {}
+virtual ~SdrUndoMoveObj();
 
 void SetDistance(const Size& rDist) { aDistance=rDist; }
 const Size& GetDistance() const { return aDistance; }
diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx
index 0a793f2..d58b170 100644
--- a/svx/source/svdraw/svdundo.cxx
+++ b/svx/source/svdraw/svdundo.cxx
@@ -64,6 +64,8 @@ static void ImplUnmarkObject( SdrObject* pObj )
 
 TYPEINIT1(SdrUndoAction,SfxUndoAction);
 
+SdrUndoAction::~SdrUndoAction() {}
+
 sal_Bool SdrUndoAction::CanRepeat(SfxRepeatTarget& rView) const
 {
 SdrView* pV=PTR_CAST(SdrView,&rView);
@@ -553,6 +555,8 @@ XubString SdrUndoAttrObj::GetSdrRepeatComment(SdrView& 
/*rView*/) const
 
 

 
+SdrUndoMoveObj::~SdrUndoMoveObj() {}
+
 void SdrUndoMoveObj::Undo()
 {
 // Trigger PageChangeCall
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: writerfilter/source

2012-09-13 Thread Libreoffice Gerrit user

 writerfilter/source/dmapper/DomainMapper.cxx  |   56 ++
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   31 +---
 writerfilter/source/dmapper/DomainMapper_Impl.hxx |4 +
 3 files changed, 84 insertions(+), 7 deletions(-)

New commits:
commit c5f9d61d45e56d9baaf6e9a91640c60d9b549aab
Author: Miklos Vajna 
Date:   Thu Sep 13 10:01:23 2012 +0200

n#778836 fix DOCX import of right margin vs numbering and paragraph styles

The problem was that the left / first paragraph margin was defined in
the numbering style, and that zeroed out the already inherited right
margin.

Change-Id: Ife521d1de4868a7be33de5f8d6af363d10cbc903

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index 4866e2d..8f9476a 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1443,6 +1443,38 @@ void DomainMapper::lcl_sprm(Sprm & rSprm)
 sprmWithProps( rSprm, m_pImpl->GetTopContext() );
 }
 
+sal_Int32 
lcl_getCurrentNumberingProperty(uno::Reference 
xNumberingRules, sal_Int32 nNumberingLevel, OUString aProp)
+{
+sal_Int32 nRet = 0;
+
+try
+{
+if (nNumberingLevel < 0) // It seems it's valid to omit numbering 
level, and in that case it means zero.
+nNumberingLevel = 0;
+if (xNumberingRules.is())
+{
+uno::Sequence aProps;
+xNumberingRules->getByIndex(nNumberingLevel) >>= aProps;
+for (int i = 0; i < aProps.getLength(); ++i)
+{
+const beans::PropertyValue& rProp = aProps[i];
+
+if (rProp.Name == aProp)
+{
+rProp.Value >>= nRet;
+break;
+}
+}
+}
+}
+catch( const uno::Exception& )
+{
+// This can happen when the doc contains some hand-crafted invalid 
list level.
+}
+
+return nRet;
+}
+
 void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, 
SprmType eSprmType )
 {
 OSL_ENSURE(rContext.get(), "PropertyMap has to be valid!");
@@ -2970,9 +3002,33 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, 
PropertyMapPtr rContext, SprmType
 const StyleSheetPropertyMap* pStyleSheetProperties = 
dynamic_cast(pEntry ? pEntry->pProperties.get() : 
0);
 
 if( pStyleSheetProperties && pStyleSheetProperties->GetListId() >= 
0 )
+{
 rContext->Insert( PROP_NUMBERING_STYLE_NAME, true, 
uno::makeAny(
 ListDef::GetStyleName( 
pStyleSheetProperties->GetListId( ) ) ), false);
 
+// We're inheriting properties from a numbering style. Make 
sure a possible right margin is inherited from the base style.
+sal_Int32 nParaRightMargin = 0;
+if (!pEntry->sBaseStyleIdentifier.isEmpty())
+{
+const StyleSheetEntryPtr pParent = 
pStyleTable->FindStyleSheetByISTD(pEntry->sBaseStyleIdentifier);
+const StyleSheetPropertyMap* pParentProperties = 
dynamic_cast(pParent ? pParent->pProperties.get() 
: 0);
+if (pParentProperties->find( PropertyDefinition( 
PROP_PARA_RIGHT_MARGIN, true )) != pParentProperties->end())
+nParaRightMargin = pParentProperties->find( 
PropertyDefinition( PROP_PARA_RIGHT_MARGIN, true ))->second.get();
+}
+if (nParaRightMargin != 0)
+{
+// If we're setting the right margin, we should set the 
first / left margin as well from the numbering style.
+sal_Int32 nFirstLineIndent = 
lcl_getCurrentNumberingProperty(m_pImpl->GetCurrentNumberingRules(), 
pStyleSheetProperties->GetListLevel(), "FirstLineIndent");
+sal_Int32 nParaLeftMargin = 
lcl_getCurrentNumberingProperty(m_pImpl->GetCurrentNumberingRules(), 
pStyleSheetProperties->GetListLevel(), "IndentAt");
+if (nFirstLineIndent != 0)
+rContext->Insert(PROP_PARA_FIRST_LINE_INDENT, true, 
uno::makeAny(nFirstLineIndent));
+if (nParaLeftMargin != 0)
+rContext->Insert(PROP_PARA_LEFT_MARGIN, true, 
uno::makeAny(nParaLeftMargin));
+
+rContext->Insert(PROP_PARA_RIGHT_MARGIN, true, 
uno::makeAny(nParaRightMargin));
+}
+}
+
 if( pStyleSheetProperties && pStyleSheetProperties->GetListLevel() 
>= 0 )
 rContext->Insert( PROP_NUMBERING_LEVEL, true, 
uno::makeAny(pStyleSheetProperties->GetListLevel()), false);
 }
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 40acc30..1745f7d 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -3679,9 +3679,9

[PATCH] fdo#54843 righthyphenmin fix (patch by Steven Dickson)

2012-09-13 Thread via Code Review

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/606

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/06/606/1

fdo#54843 righthyphenmin fix (patch by Steven Dickson)

Change-Id: I42747dffef099f3806178af76e20335f5f033379
---
A hyphen/hyphen-rhmin.patch
M hyphen/makefile.mk
2 files changed, 29 insertions(+), 1 deletion(-)


--
To view, visit https://gerrit.libreoffice.org/606
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I42747dffef099f3806178af76e20335f5f033379
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Németh László 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [ANN] LibreOffice 3.6.2 RC1 test builds available

2012-09-13 Thread Fridrich Strba

On 13/09/12 09:57, Fridrich Strba wrote:
> candidate build on the way towards 3.6.1, please refer to our release

Naturally, towards 3.6.2 as you already for sure figured out. I am very
bad with numbers :)

F.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[ANN] LibreOffice 3.6.2 RC1 test builds available

2012-09-13 Thread Fridrich Strba

Hi *,

for the upcoming new version 3.6.2, the RC1 builds now start to be
available on pre-releases. This build is slated to be first release
candidate build on the way towards 3.6.1, please refer to our release
plan timings here:

 http://wiki.documentfoundation.org/ReleasePlan#3.6_release

Builds are now being uploaded to a public (but non-mirrored - so don't
spread news too widely!) place, as soon as they're available. Grab
them here:

 http://dev-builds.libreoffice.org/pre-releases/

If you've a bit of time, please give them a try & report *critical*
bugs not yet in bugzilla here, so we can incorporate them into the
release notes. Please note that it takes approximately 24 hours to
populate the mirrors, so that's about the time we have to collect
feedback.

NOTE: This build is in a release configuration and _will_ replace your
existing LibreOffice install on Windows.

The list of fixed bugs relative to 3.6.1 is here:

 
http://dev-builds.libreoffice.org/pre-releases/src/bugfixes-libreoffice-3-6-2-release-3.6.2.1.log


So playing with the areas touched there also greatly appreciated - and
validation that those bugs are really fixed.

Thanks a lot for your help,

Fridrich

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - helpcontent2/to-wiki

2012-09-13 Thread Libreoffice Gerrit user

 helpcontent2/to-wiki/wikiconv2.py |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ff79af3a761f3034cf4280d5662d5c28854e0613
Author: Stephan Bergmann 
Date:   Fri Jun 15 12:07:08 2012 +0200

fdo#51074: Start table cells with "| |"

...so that a "|" in the cell content is not mistaken as separating 
parameters
from content.  But do note that  rather suggests: "To 
show a
visible pipe in a cell, use | or |."

Signed-off-by: Jan Holesovsky 

diff --git a/helpcontent2/to-wiki/wikiconv2.py 
b/helpcontent2/to-wiki/wikiconv2.py
index 837ffeb..502d05b 100755
--- a/helpcontent2/to-wiki/wikiconv2.py
+++ b/helpcontent2/to-wiki/wikiconv2.py
@@ -40,8 +40,8 @@ replace_paragraph_role = \
   'paragraph': '',
   'related': '', # used only in one file, probably in error?
   'relatedtopics': '', # used only in one file, probably in error?
-  'tablecontent': '| ',
-  'tablecontentcode': '| ',
+  'tablecontent': '| | ',
+  'tablecontentcode': '| | ',
   'tablehead': '! scope="col" | ',
   'tablenextpara': '\n',
   'tablenextparacode': '\n',
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/source

2012-09-13 Thread Libreoffice Gerrit user

 sw/source/filter/ww8/ww8par.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2f3ea72af8d8044e185fa4b96229b8b19ddf7da7
Author: Miklos Vajna 
Date:   Thu Sep 13 09:20:32 2012 +0200

SwWW8ImplReader::Read_Tab: typo

Change-Id: I0dd667ec59862acce283db5f91850306c94d207d

diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 3a86fcc..dc89f50 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -1292,7 +1292,7 @@ void SwWW8FltRefStack::SetAttrInDoc(const SwPosition& 
rTmpPos,
  For explicit attributes we turn the adjusted writer tabstops back into 0 based
  word indexes and we'll turn them back into writer indexes when setting them
  into the document. If explicit left indent exist which affects them, then this
- is handled when the explict left indent is set into the document
+ is handled when the explicit left indent is set into the document
 */
 void SwWW8ImplReader::Read_Tab(sal_uInt16 , const sal_uInt8* pData, short nLen)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 37361] LibreOffice 3.5 most annoying bugs

2012-09-13 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=37361

--- Comment #377 from tommy27  2012-09-13 06:09:33 UTC ---
s(In reply to comment #376)
> Added Bug 48279 - autocorrect limit. acor.dat with entry 65535: Loop and/or
> loss of acor data.
> 


sorry, I meant Added Bug 48729 - autocorrect limit. acor.dat with entry 65535:
Loop and/or loss of acor data.

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 37361] LibreOffice 3.5 most annoying bugs

2012-09-13 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=37361

tommy27  changed:

   What|Removed |Added

 Depends on||48729

--- Comment #376 from tommy27  2012-09-13 06:07:24 UTC ---
Added Bug 48279 - autocorrect limit. acor.dat with entry 65535: Loop and/or
loss of acor data.

IMHO this is very annoying since the 65K limit of autocorrect entries is
something that sooner or later any user will face and the after reaching that
limit the autocorrect database will be reset to 0 loosing all entries
collected.

it seems the 65K limit is related to 16-bit encoding...
is there any chance to raise this limit from 16^2 to 20^2 or 32^2 ?
something similar was done in Calc to allow more than 65K columns (actually I
think it can handle 1 million)

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 44446] LibreOffice 3.6 most annoying bugs

2012-09-13 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=6

Mas  changed:

   What|Removed |Added

 CC||airtime...@yahoo.com
 Depends on||54827

--- Comment #116 from Mas  2012-09-13 06:07:18 UTC ---
54827 - FILEOPEN: File open from NTFS Filesystem- crashes Write -version 3.6
,3..6.1

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

63 matches

Mail list logo