frmdlg.cxx (efeef26f) | frmdlg.cxx (64b14621) |
---|---|
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 --- 91 unchanged lines hidden (view full) --- 100 AddTabPage( RID_SVXPAGE_GRFCROP ); 101 } 102 if (m_nDlgType == DLG_FRM_STD) 103 { 104 AddTabPage(TP_COLUMN, SwColumnPage::Create, 0); 105 } 106 SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); 107 DBG_ASSERT(pFact, "Dialogdiet fail!"); | 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 --- 91 unchanged lines hidden (view full) --- 100 AddTabPage( RID_SVXPAGE_GRFCROP ); 101 } 102 if (m_nDlgType == DLG_FRM_STD) 103 { 104 AddTabPage(TP_COLUMN, SwColumnPage::Create, 0); 105 } 106 SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); 107 DBG_ASSERT(pFact, "Dialogdiet fail!"); |
108 AddTabPage(TP_BACKGROUND, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), 0 ); 109 AddTabPage( TP_MACRO_ASSIGN, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_MACROASSIGN), 0); | 108 109 //UUUU remove? 110 // AddTabPage(TP_BACKGROUND, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), 0 ); 111 112 //UUUU add Area and Transparence TabPages 113 AddTabPage(RID_SVXPAGE_AREA); 114 AddTabPage(RID_SVXPAGE_TRANSPARENCE); 115 116 AddTabPage( TP_MACRO_ASSIGN, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_MACROASSIGN), 0); |
110 AddTabPage( TP_BORDER, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), 0 ); 111 112 if(m_bHTMLMode) 113 { 114 switch( m_nDlgType ) 115 { 116 case DLG_FRM_STD: 117 if(0 == (nHtmlMode & HTMLMODE_SOME_ABS_POS)) 118 RemoveTabPage(TP_BORDER); 119 RemoveTabPage(TP_COLUMN); 120 // kein break 121 case DLG_FRM_OLE: 122 RemoveTabPage(TP_FRM_URL); 123 RemoveTabPage(TP_MACRO_ASSIGN); 124 break; 125 case DLG_FRM_GRF: 126 RemoveTabPage(RID_SVXPAGE_GRFCROP); 127 break; 128 } | 117 AddTabPage( TP_BORDER, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), 0 ); 118 119 if(m_bHTMLMode) 120 { 121 switch( m_nDlgType ) 122 { 123 case DLG_FRM_STD: 124 if(0 == (nHtmlMode & HTMLMODE_SOME_ABS_POS)) 125 RemoveTabPage(TP_BORDER); 126 RemoveTabPage(TP_COLUMN); 127 // kein break 128 case DLG_FRM_OLE: 129 RemoveTabPage(TP_FRM_URL); 130 RemoveTabPage(TP_MACRO_ASSIGN); 131 break; 132 case DLG_FRM_GRF: 133 RemoveTabPage(RID_SVXPAGE_GRFCROP); 134 break; 135 } |
129 if( 0 == (nHtmlMode & HTMLMODE_SOME_ABS_POS) || 130 m_nDlgType != DLG_FRM_STD ) 131 RemoveTabPage(TP_BACKGROUND); | 136 if( 0 == (nHtmlMode & HTMLMODE_SOME_ABS_POS) || m_nDlgType != DLG_FRM_STD ) 137 { 138 //UUUU RemoveTabPage(TP_BACKGROUND); 139 RemoveTabPage(RID_SVXPAGE_AREA); 140 RemoveTabPage(RID_SVXPAGE_TRANSPARENCE); 141 } |
132 } 133 134 if (m_bNew) 135 SetCurPageId(TP_FRM_STD); 136 137 if (nDefPage) 138 SetCurPageId(nDefPage); 139} --- 6 unchanged lines hidden (view full) --- 146{ 147} 148 149 150 151 152void SwFrmDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) 153{ | 142 } 143 144 if (m_bNew) 145 SetCurPageId(TP_FRM_STD); 146 147 if (nDefPage) 148 SetCurPageId(nDefPage); 149} --- 6 unchanged lines hidden (view full) --- 156{ 157} 158 159 160 161 162void SwFrmDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) 163{ |
154 SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); | |
155 switch ( nId ) 156 { 157 case TP_FRM_STD: 158 ((SwFrmPage&)rPage).SetNewFrame(m_bNew); 159 ((SwFrmPage&)rPage).SetFormatUsed(m_bFormat); 160 ((SwFrmPage&)rPage).SetFrmType(m_nDlgType); 161 break; 162 --- 18 unchanged lines hidden (view full) --- 181 const SwFmtFrmSize& rSize = (const SwFmtFrmSize&) 182 m_rSet.Get( RES_FRM_SIZE ); 183 ((SwColumnPage&)rPage).SetPageWidth( rSize.GetWidth() ); 184 } 185 break; 186 187 case TP_MACRO_ASSIGN: 188 { | 164 switch ( nId ) 165 { 166 case TP_FRM_STD: 167 ((SwFrmPage&)rPage).SetNewFrame(m_bNew); 168 ((SwFrmPage&)rPage).SetFormatUsed(m_bFormat); 169 ((SwFrmPage&)rPage).SetFrmType(m_nDlgType); 170 break; 171 --- 18 unchanged lines hidden (view full) --- 190 const SwFmtFrmSize& rSize = (const SwFmtFrmSize&) 191 m_rSet.Get( RES_FRM_SIZE ); 192 ((SwColumnPage&)rPage).SetPageWidth( rSize.GetWidth() ); 193 } 194 break; 195 196 case TP_MACRO_ASSIGN: 197 { |
189 SfxAllItemSet aNewSet(*aSet.GetPool()); | 198 SfxAllItemSet aNewSet(*GetInputSetImpl()->GetPool()); |
190 aNewSet.Put( SwMacroAssignDlg::AddEvents( 191 DLG_FRM_GRF == m_nDlgType ? MACASSGN_GRAPHIC : DLG_FRM_OLE == m_nDlgType ? MACASSGN_OLE : MACASSGN_FRMURL ) ); 192 if ( m_pWrtShell ) 193 rPage.SetFrame( m_pWrtShell->GetView().GetViewFrame()->GetFrame().GetFrameInterface() ); 194 rPage.PageCreated(aNewSet); 195 break; 196 } 197 | 199 aNewSet.Put( SwMacroAssignDlg::AddEvents( 200 DLG_FRM_GRF == m_nDlgType ? MACASSGN_GRAPHIC : DLG_FRM_OLE == m_nDlgType ? MACASSGN_OLE : MACASSGN_FRMURL ) ); 201 if ( m_pWrtShell ) 202 rPage.SetFrame( m_pWrtShell->GetView().GetViewFrame()->GetFrame().GetFrameInterface() ); 203 rPage.PageCreated(aNewSet); 204 break; 205 } 206 |
198 case TP_BACKGROUND: 199 if( DLG_FRM_STD == m_nDlgType ) 200 { 201 sal_Int32 nFlagType = SVX_SHOW_SELECTOR; 202 if(!m_bHTMLMode) 203 nFlagType |= SVX_ENABLE_TRANSPARENCY; 204 aSet.Put (SfxUInt32Item(SID_FLAG_TYPE, nFlagType)); 205 rPage.PageCreated(aSet); 206 } 207 break; | 207 //UUUU 208 //case TP_BACKGROUND: 209 // if( DLG_FRM_STD == m_nDlgType ) 210 // { 211 // sal_Int32 nFlagType = SVX_SHOW_SELECTOR; 212 // if(!m_bHTMLMode) 213 // nFlagType |= SVX_ENABLE_TRANSPARENCY; 214 // SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); 215 // aSet.Put (SfxUInt32Item(SID_FLAG_TYPE, nFlagType)); 216 // rPage.PageCreated(aSet); 217 // } 218 // break; |
208 209 case TP_BORDER: 210 { | 219 220 case TP_BORDER: 221 { |
222 SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); |
|
211 aSet.Put (SfxUInt16Item(SID_SWMODE_TYPE,SW_BORDER_MODE_FRAME)); 212 rPage.PageCreated(aSet); 213 } 214 break; | 223 aSet.Put (SfxUInt16Item(SID_SWMODE_TYPE,SW_BORDER_MODE_FRAME)); 224 rPage.PageCreated(aSet); 225 } 226 break; |
215 } | 227 228 //UUUU inits for Area and Transparency TabPages 229 case RID_SVXPAGE_AREA: 230 { 231 rPage.PageCreated(m_rSet); 232 } 233 break; 234 235 case RID_SVXPAGE_TRANSPARENCE: 236 { 237 rPage.PageCreated(m_rSet); 238 } 239 break; 240 } |
216} 217 | 241} 242 |