scdll.cxx (b3f79822) | scdll.cxx (22de8995) |
---|---|
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 --- 23 unchanged lines hidden (view full) --- 32#ifndef _FM_FMOBJFAC_HXX 33#include <svx/fmobjfac.hxx> 34#endif 35#include <svx/objfac3d.hxx> 36#include <svx/tbxcolor.hxx> 37 38#include <sot/clsids.hxx> 39#include <sfx2/taskpane.hxx> | 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 --- 23 unchanged lines hidden (view full) --- 32#ifndef _FM_FMOBJFAC_HXX 33#include <svx/fmobjfac.hxx> 34#endif 35#include <svx/objfac3d.hxx> 36#include <svx/tbxcolor.hxx> 37 38#include <sot/clsids.hxx> 39#include <sfx2/taskpane.hxx> |
40#include <sfx2/SidebarChildWindow.hxx> |
|
40#include <sfx2/docfilt.hxx> 41#include <sfx2/fcontnr.hxx> 42#include <sfx2/docfile.hxx> 43#include <sfx2/app.hxx> 44#include <avmedia/mediaplayer.hxx> 45#include <avmedia/mediatoolbox.hxx> 46#include <comphelper/types.hxx> 47#include <svx/extrusioncolorcontrol.hxx> --- 209 unchanged lines hidden (view full) --- 257 SvxCTLTextTbxCtrl::RegisterControl(SID_ATTR_PARA_LEFT_TO_RIGHT, pMod); 258 SvxCTLTextTbxCtrl::RegisterControl(SID_ATTR_PARA_RIGHT_TO_LEFT, pMod); 259 260 //Media Controller 261 ::avmedia::MediaToolBoxControl::RegisterControl( SID_AVMEDIA_TOOLBOX, pMod ); 262 263 // common SFX controller 264 ::sfx2::TaskPaneWrapper::RegisterChildWindow( sal_False, pMod ); | 41#include <sfx2/docfilt.hxx> 42#include <sfx2/fcontnr.hxx> 43#include <sfx2/docfile.hxx> 44#include <sfx2/app.hxx> 45#include <avmedia/mediaplayer.hxx> 46#include <avmedia/mediatoolbox.hxx> 47#include <comphelper/types.hxx> 48#include <svx/extrusioncolorcontrol.hxx> --- 209 unchanged lines hidden (view full) --- 258 SvxCTLTextTbxCtrl::RegisterControl(SID_ATTR_PARA_LEFT_TO_RIGHT, pMod); 259 SvxCTLTextTbxCtrl::RegisterControl(SID_ATTR_PARA_RIGHT_TO_LEFT, pMod); 260 261 //Media Controller 262 ::avmedia::MediaToolBoxControl::RegisterControl( SID_AVMEDIA_TOOLBOX, pMod ); 263 264 // common SFX controller 265 ::sfx2::TaskPaneWrapper::RegisterChildWindow( sal_False, pMod ); |
265 | 266 ::sfx2::SidebarChildWindow::RegisterChildWindow(NULL, pMod); 267 |
266 // Svx-StatusBar-Controller 267 SvxInsertStatusBarControl ::RegisterControl(SID_ATTR_INSERT, pMod); 268 SvxSelectionModeControl ::RegisterControl(SID_STATUS_SELMODE, pMod); 269 SvxZoomStatusBarControl ::RegisterControl(SID_ATTR_ZOOM, pMod); 270 SvxZoomSliderControl ::RegisterControl(SID_ATTR_ZOOMSLIDER, pMod); 271 SvxModifyControl ::RegisterControl(SID_DOC_MODIFIED, pMod); 272 XmlSecStatusBarControl ::RegisterControl( SID_SIGNATURE, pMod ); 273 --- 88 unchanged lines hidden --- | 268 // Svx-StatusBar-Controller 269 SvxInsertStatusBarControl ::RegisterControl(SID_ATTR_INSERT, pMod); 270 SvxSelectionModeControl ::RegisterControl(SID_STATUS_SELMODE, pMod); 271 SvxZoomStatusBarControl ::RegisterControl(SID_ATTR_ZOOM, pMod); 272 SvxZoomSliderControl ::RegisterControl(SID_ATTR_ZOOMSLIDER, pMod); 273 SvxModifyControl ::RegisterControl(SID_DOC_MODIFIED, pMod); 274 XmlSecStatusBarControl ::RegisterControl( SID_SIGNATURE, pMod ); 275 --- 88 unchanged lines hidden --- |