viewshel.cxx (7a32b0c8) viewshel.cxx (cc69f169)
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 77 unchanged lines hidden (view full) ---

86// #96090#
87#include <svl/slstitm.hxx>
88#include <sfx2/request.hxx>
89#include "SpellDialogChildWindow.hxx"
90
91#include "Window.hxx"
92#include "fupoor.hxx"
93
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 77 unchanged lines hidden (view full) ---

86// #96090#
87#include <svl/slstitm.hxx>
88#include <sfx2/request.hxx>
89#include "SpellDialogChildWindow.hxx"
90
91#include "Window.hxx"
92#include "fupoor.hxx"
93
94#include <editeng/numitem.hxx>
95#include <editeng/eeitem.hxx>
96#include <svl/poolitem.hxx>
97#include <glob.hrc>
98
94#ifndef SO2_DECL_SVINPLACEOBJECT_DEFINED
95#define SO2_DECL_SVINPLACEOBJECT_DEFINED
96SO2_DECL_REF(SvInPlaceObject)
97#endif
98
99namespace sd { namespace ui { namespace table {
100 extern SfxShell* CreateTableObjectBar( ViewShell& rShell, ::sd::View* pView );
101} } }

--- 695 unchanged lines hidden (view full) ---

797 mpHorizontalRuler->SetWinPos(nHRulerOfs);
798 mpHorizontalRuler->SetActive(sal_True);
799 mpHorizontalRuler->Show();
800 }
801 }
802 }
803}
804
99#ifndef SO2_DECL_SVINPLACEOBJECT_DEFINED
100#define SO2_DECL_SVINPLACEOBJECT_DEFINED
101SO2_DECL_REF(SvInPlaceObject)
102#endif
103
104namespace sd { namespace ui { namespace table {
105 extern SfxShell* CreateTableObjectBar( ViewShell& rShell, ::sd::View* pView );
106} } }

--- 695 unchanged lines hidden (view full) ---

802 mpHorizontalRuler->SetWinPos(nHRulerOfs);
803 mpHorizontalRuler->SetActive(sal_True);
804 mpHorizontalRuler->Show();
805 }
806 }
807 }
808}
809
810const SfxPoolItem* ViewShell::GetNumBulletItem(SfxItemSet& aNewAttr, sal_uInt16& nNumItemId)
811{
812 const SfxPoolItem* pTmpItem = NULL;
813
814 if(aNewAttr.GetItemState(nNumItemId, sal_False, &pTmpItem) == SFX_ITEM_SET)
815 {
816 return pTmpItem;
817 }
818 else
819 {
820 nNumItemId = aNewAttr.GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE);
821 SfxItemState eState = aNewAttr.GetItemState(nNumItemId, sal_False, &pTmpItem);
822 if (eState == SFX_ITEM_SET)
823 return pTmpItem;
824 else
825 {
826 sal_Bool bOutliner = sal_False;
827 sal_Bool bTitle = sal_False;
805
828
829 if( mpView )
830 {
831 const SdrMarkList& rMarkList = mpView->GetMarkedObjectList();
832 const sal_uInt32 nCount = rMarkList.GetMarkCount();
833
834 for(sal_uInt32 nNum = 0; nNum < nCount; nNum++)
835 {
836 SdrObject* pObj = rMarkList.GetMark(nNum)->GetMarkedSdrObj();
837 if( pObj->GetObjInventor() == SdrInventor )
838 {
839 switch(pObj->GetObjIdentifier())
840 {
841 case OBJ_TITLETEXT:
842 bTitle = sal_True;
843 break;
844 case OBJ_OUTLINETEXT:
845 bOutliner = sal_True;
846 break;
847 }
848 }
849 }
850 }
806
851
852 const SvxNumBulletItem *pItem = NULL;
853 if(bOutliner)
854 {
855 SfxStyleSheetBasePool* pSSPool = mpView->GetDocSh()->GetStyleSheetPool();
856 String aStyleName((SdResId(STR_LAYOUT_OUTLINE)));
857 aStyleName.AppendAscii( RTL_CONSTASCII_STRINGPARAM( " 1" ) );
858 SfxStyleSheetBase* pFirstStyleSheet = pSSPool->Find( aStyleName, SD_STYLE_FAMILY_PSEUDO);
859 if( pFirstStyleSheet )
860 pFirstStyleSheet->GetItemSet().GetItemState(EE_PARA_NUMBULLET, sal_False, (const SfxPoolItem**)&pItem);
861 }
807
862
863 if( pItem == NULL )
864 pItem = (SvxNumBulletItem*) aNewAttr.GetPool()->GetSecondaryPool()->GetPoolDefaultItem(EE_PARA_NUMBULLET);
865
866 aNewAttr.Put(*pItem, EE_PARA_NUMBULLET);
867
868 if(bTitle && aNewAttr.GetItemState(EE_PARA_NUMBULLET,sal_True) == SFX_ITEM_ON )
869 {
870 SvxNumBulletItem* pItem = (SvxNumBulletItem*)aNewAttr.GetItem(EE_PARA_NUMBULLET,sal_True);
871 SvxNumRule* pRule = pItem->GetNumRule();
872 if(pRule)
873 {
874 SvxNumRule aNewRule( *pRule );
875 aNewRule.SetFeatureFlag( NUM_NO_NUMBERS, sal_True );
876
877 SvxNumBulletItem aNewItem( aNewRule, EE_PARA_NUMBULLET );
878 aNewAttr.Put(aNewItem);
879 }
880 }
881
882 SfxItemState eState = aNewAttr.GetItemState(nNumItemId, sal_False, &pTmpItem);
883 if (eState == SFX_ITEM_SET)
884 return pTmpItem;
885
886 }
887 }
888 return pTmpItem;
889}
890
891
808sal_Bool ViewShell::HasRuler (void)
809{
810 return mbHasRulers;
811}
812
813
814
815

--- 826 unchanged lines hidden --- 		892sal_Bool ViewShell::HasRuler (void)
893{
894 return mbHasRulers;
895}
896
897
898
899

--- 826 unchanged lines hidden ---