[Libreoffice-commits] core.git: include/svl sfx2/source

[Noel Grandin]

 include/svl/itemset.hxx        |    4 ----
 sfx2/source/dialog/dinfdlg.cxx |   12 ++++++------
 2 files changed, 6 insertions(+), 10 deletions(-)

New commits:
commit cee21bf941df321e3c0e8dfd41a5555e32d33ab9
Author: Noel Grandin <n...@peralex.com>
Date:   Thu Oct 2 08:15:00 2014 +0200

    fix build
    
    after commit 039b887c54fd7e8cd8a4964d1633fdfc300e938e
    "loplugin: cstylecast"
    
    Change-Id: If567653833a1f164a72bd9a5a6c0fcf651e9d3c0

diff --git a/include/svl/itemset.hxx b/include/svl/itemset.hxx
index 418eb86..f2598ef 100644
--- a/include/svl/itemset.hxx
+++ b/include/svl/itemset.hxx
@@ -95,10 +95,6 @@ public:
                                                 bool bSrchInParent = true,
                                                 const SfxPoolItem **ppItem = 0 
) const;
 
-    SfxItemState                GetItemState(   sal_uInt16 nWhich,
-                                                bool bSrchInParent = true,
-                                                SfxPoolItem **ppItem = 0 );
-
     bool                        HasItem(sal_uInt16 nWhich, const SfxPoolItem** 
ppItem = NULL) const;
 
     virtual void                DisableItem(sal_uInt16 nWhich);
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 46723e3..cf9aab2 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -934,13 +934,13 @@ bool SfxDocumentPage::FillItemSet( SfxItemSet* rSet )
          GetTabDialog() && GetTabDialog()->GetExampleSet() )
     {
         SfxItemSet* pExpSet = GetTabDialog()->GetExampleSet();
-        SfxPoolItem* pItem;
+        const SfxPoolItem* pItem;
 
         if ( pExpSet && SfxItemState::SET == pExpSet->GetItemState( 
SID_DOCINFO, true, &pItem ) )
         {
-            SfxDocumentInfoItem* m_pInfoItem = 
static_cast<SfxDocumentInfoItem*>(pItem);
+            const SfxDocumentInfoItem* m_pInfoItem = static_cast<const 
SfxDocumentInfoItem*>(pItem);
             bool bUseData = ( TRISTATE_TRUE == m_pUseUserDataCB->GetState() );
-            m_pInfoItem->SetUseUserData( bUseData );
+            const_cast<SfxDocumentInfoItem*>(m_pInfoItem)->SetUseUserData( 
bUseData );
             rSet->Put( SfxDocumentInfoItem( *m_pInfoItem ) );
             bRet = true;
         }
@@ -949,16 +949,16 @@ bool SfxDocumentPage::FillItemSet( SfxItemSet* rSet )
     if ( bHandleDelete )
     {
         SfxItemSet* pExpSet = GetTabDialog()->GetExampleSet();
-        SfxPoolItem* pItem;
+        const SfxPoolItem* pItem;
         if ( pExpSet && SfxItemState::SET == pExpSet->GetItemState( 
SID_DOCINFO, true, &pItem ) )
         {
-            SfxDocumentInfoItem* pInfoItem = 
static_cast<SfxDocumentInfoItem*>(pItem);
+            const SfxDocumentInfoItem* pInfoItem = static_cast<const 
SfxDocumentInfoItem*>(pItem);
             bool bUseAuthor = bEnableUseUserData && 
m_pUseUserDataCB->IsChecked();
             SfxDocumentInfoItem newItem( *pInfoItem );
             newItem.resetUserData( bUseAuthor
                 ? SvtUserOptions().GetFullName()
                 : OUString() );
-            pInfoItem->SetUseUserData( TRISTATE_TRUE == 
m_pUseUserDataCB->GetState() );
+            const_cast<SfxDocumentInfoItem*>(pInfoItem)->SetUseUserData( 
TRISTATE_TRUE == m_pUseUserDataCB->GetState() );
             newItem.SetUseUserData( TRISTATE_TRUE == 
m_pUseUserDataCB->GetState() );
 
             newItem.SetDeleteUserData( true );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits