[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - framework/source sfx2/source writerfilter/inc writerfilter/source

[Herbert Dürr]

 framework/source/uielement/uicommanddescription.cxx |    2 +-
 sfx2/source/dialog/mgetempl.cxx                     |    1 +
 writerfilter/inc/ooxml/OOXMLDocument.hxx            |    2 +-
 writerfilter/source/ooxml/OOXMLDocumentImpl.cxx     |    2 +-
 writerfilter/source/ooxml/OOXMLDocumentImpl.hxx     |    2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 2d7bf3f95cdecc12068a4e7ed80ee39e94703e9a
Author: Herbert Dürr <hdu at apache.org>
Date:   Wed Jan 8 09:02:05 2014 +0000

    #i123693# WaE: const type qualifier ignored on return value
    
    this fix removes another 70 warnings when building with a newer gcc

diff --git a/writerfilter/inc/ooxml/OOXMLDocument.hxx b/writerfilter/inc/ooxml/OOXMLDocument.hxx
index fab2ab3..16449fc 100644
--- a/writerfilter/inc/ooxml/OOXMLDocument.hxx
+++ b/writerfilter/inc/ooxml/OOXMLDocument.hxx
@@ -242,7 +242,7 @@ public:
     virtual uno::Reference<io::XInputStream> getInputStreamForId( const ::rtl::OUString & rId ) = 0;
 
     virtual void setIDForXNoteStream( const sal_Int32 nID ) = 0;
-    virtual const sal_Int32 getIDForXNoteStream() const = 0;
+    virtual sal_Int32 getIDForXNoteStream() const = 0;
 
     virtual const ::rtl::OUString & getTarget() const = 0;
 };
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
index cd92bdf..b801435 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
@@ -132,7 +132,7 @@ void OOXMLDocumentImpl::setIDForXNoteStream( const sal_Int32 nID )
     mnIDForXNoteStream = nID;
 }
 
-const sal_Int32 OOXMLDocumentImpl::getIDForXNoteStream() const
+sal_Int32 OOXMLDocumentImpl::getIDForXNoteStream() const
 {
     return mnIDForXNoteStream;
 }
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx b/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
index 1d1ca53..6b611e1 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
@@ -120,7 +120,7 @@ public:
     virtual uno::Reference<io::XInputStream> getInputStreamForId(const rtl::OUString & rId);
 
     virtual void setIDForXNoteStream( const sal_Int32 nID );
-    virtual const sal_Int32 getIDForXNoteStream() const;
+    virtual sal_Int32 getIDForXNoteStream() const;
 
     virtual const ::rtl::OUString & getTarget() const;
 };
commit e4eb014761df0bd5c88acbcee1935743cb2a04e0
Author: Tsutomu Uchino <hanya at apache.org>
Date:   Wed Jan 8 08:36:06 2014 +0000

    #i118909# fix empty elements of return value in UICategoryDescription::getElementNames

diff --git a/framework/source/uielement/uicommanddescription.cxx b/framework/source/uielement/uicommanddescription.cxx
index 6e66113..dbd9b8e 100644
--- a/framework/source/uielement/uicommanddescription.cxx
+++ b/framework/source/uielement/uicommanddescription.cxx
@@ -761,7 +761,7 @@ throw (::com::sun::star::uno::RuntimeException)
     ModuleToCommandFileMap::const_iterator pIter = m_aModuleToCommandFileMap.begin();
     while ( pIter != m_aModuleToCommandFileMap.end() )
     {
-        aSeq[n] = pIter->first;
+        aSeq[n++] = pIter->first;
         ++pIter;
     }
 
commit 3acdfc0f4c1f30c9030361e51c13d19556ea816f
Author: Tsutomu Uchino <hanya at apache.org>
Date:   Wed Jan 8 08:11:15 2014 +0000

    #i18109# pre-select the name in new style dialog

diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx
index c70b826..0d5a9c4 100644
--- a/sfx2/source/dialog/mgetempl.cxx
+++ b/sfx2/source/dialog/mgetempl.cxx
@@ -494,6 +494,7 @@ void SfxManageStyleSheetPage::Reset( const SfxItemSet& /*rAttrSet*/ )
     if ( sCmp != aName )
         pStyle->SetName( aName );
     aNameEd.SetText( aName );
+    aNameEd.SetSelection( Selection( SELECTION_MIN, SELECTION_MAX ) );
 
     if ( aFollowLb.IsEnabled() )
     {