Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
d311b65f
Kaydet (Commit)
d311b65f
authored
Tem 14, 2015
tarafından
Maxim Monastirsky
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Convert optimize table button to the generic controller
Change-Id: I6b9089daaa2bb7d0dfc1072296fc51401e5fc88a
üst
489af4ed
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
16 additions
and
201 deletions
+16
-201
subtoolboxcontrol.hxx
include/svx/subtoolboxcontrol.hxx
+0
-47
Controller.xcu
...cfg/registry/data/org/openoffice/Office/UI/Controller.xcu
+14
-0
precompiled_sd.hxx
sd/inc/pch/precompiled_sd.hxx
+0
-1
sddll.cxx
sd/source/ui/app/sddll.cxx
+0
-2
Library_svx.mk
svx/Library_svx.mk
+0
-1
svx.sdi
svx/sdi/svx.sdi
+1
-1
subtoolboxcontrol.cxx
svx/source/tbxctrls/subtoolboxcontrol.cxx
+0
-55
Library_sw.mk
sw/Library_sw.mk
+0
-1
swriter.sdi
sw/sdi/swriter.sdi
+1
-1
swmodule.cxx
sw/source/uibase/app/swmodule.cxx
+0
-3
tblctrl.hxx
sw/source/uibase/inc/tblctrl.hxx
+0
-39
tblctrl.cxx
sw/source/uibase/ribbar/tblctrl.cxx
+0
-50
No files found.
include/svx/subtoolboxcontrol.hxx
deleted
100644 → 0
Dosyayı görüntüle @
489af4ed
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef INCLUDED_SVX_SUBTOOLBOXCONTROL_HXX
#define INCLUDED_SVX_SUBTOOLBOXCONTROL_HXX
#include <svx/svxdllapi.h>
#include <sfx2/tbxctrl.hxx>
class
SVX_DLLPUBLIC
SvxSubToolBoxControl
:
public
SfxToolBoxControl
{
public
:
SFX_DECL_TOOLBOX_CONTROL
();
SvxSubToolBoxControl
(
sal_uInt16
nSlotId
,
sal_uInt16
nId
,
ToolBox
&
rTbx
);
virtual
~
SvxSubToolBoxControl
();
virtual
VclPtr
<
SfxPopupWindow
>
CreatePopupWindow
()
SAL_OVERRIDE
;
};
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
Dosyayı görüntüle @
d311b65f
...
...
@@ -176,6 +176,20 @@
</node>
</node>
<node
oor:name=
"ToolBar"
>
<node
oor:name=
"OptimizeTableControl"
oor:op=
"replace"
>
<prop
oor:name=
"Command"
>
<value>
.uno:OptimizeTable
</value>
</prop>
<prop
oor:name=
"Module"
>
<value/>
</prop>
<prop
oor:name=
"Controller"
>
<value>
com.sun.star.comp.framework.SubToolBarController
</value>
</prop>
<prop
oor:name=
"Value"
>
<value>
optimizetablebar
</value>
</prop>
</node>
<node
oor:name=
"InsertControl"
oor:op=
"replace"
>
<prop
oor:name=
"Command"
>
<value>
.uno:InsertCtrl
</value>
...
...
sd/inc/pch/precompiled_sd.hxx
Dosyayı görüntüle @
d311b65f
...
...
@@ -707,7 +707,6 @@
#include <svx/sidebar/SelectionAnalyzer.hxx>
#include <svx/sphere3d.hxx>
#include <svx/srchdlg.hxx>
#include <svx/subtoolboxcontrol.hxx>
#include <svx/svdattr.hxx>
#include <svx/svddef.hxx>
#include <svx/svddrgmt.hxx>
...
...
sd/source/ui/app/sddll.cxx
Dosyayı görüntüle @
d311b65f
...
...
@@ -81,7 +81,6 @@
#include <svx/modctrl.hxx>
#include <svx/pszctrl.hxx>
#include <svx/srchdlg.hxx>
#include <svx/subtoolboxcontrol.hxx>
#include <svx/SvxColorChildWindow.hxx>
#include <svx/SvxShapeTypes.hxx>
#include <svx/tbcontrl.hxx>
...
...
@@ -262,7 +261,6 @@ void SdDLL::RegisterControllers()
SvxFrameLineStyleToolBoxControl
::
RegisterControl
(
SID_FRAME_LINESTYLE
,
pMod
);
SvxColorToolBoxControl
::
RegisterControl
(
SID_FRAME_LINECOLOR
,
pMod
);
SvxFrameToolBoxControl
::
RegisterControl
(
SID_ATTR_BORDER
,
pMod
);
SvxSubToolBoxControl
::
RegisterControl
(
SID_OPTIMIZE_TABLE
,
pMod
);
}
void
SdDLL
::
Init
()
...
...
svx/Library_svx.mk
Dosyayı görüntüle @
d311b65f
...
...
@@ -225,7 +225,6 @@ $(eval $(call gb_Library_add_exception_objects,svx,\
svx/source/tbxctrls/layctrl \
svx/source/tbxctrls/lboxctrl \
svx/source/tbxctrls/linectrl \
svx/source/tbxctrls/subtoolboxcontrol \
svx/source/tbxctrls/tbunocontroller \
svx/source/tbxctrls/tbunosearchcontrollers \
svx/source/tbxctrls/tbxalign \
...
...
svx/sdi/svx.sdi
Dosyayı görüntüle @
d311b65f
...
...
@@ -15154,7 +15154,7 @@ SfxVoidItem SplitCell SID_TABLE_SPLIT_CELLS
GroupId = GID_TABLE;
]
Sfx
UInt16
Item OptimizeTable SID_OPTIMIZE_TABLE
Sfx
Void
Item OptimizeTable SID_OPTIMIZE_TABLE
[
/* flags: */
...
...
svx/source/tbxctrls/subtoolboxcontrol.cxx
deleted
100644 → 0
Dosyayı görüntüle @
489af4ed
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <svl/intitem.hxx>
#include <vcl/toolbox.hxx>
#include <sfx2/app.hxx>
#include <svx/subtoolboxcontrol.hxx>
#include <svx/svxids.hrc>
SFX_IMPL_TOOLBOX_CONTROL
(
SvxSubToolBoxControl
,
SfxUInt16Item
);
SvxSubToolBoxControl
::
SvxSubToolBoxControl
(
sal_uInt16
nSlotId
,
sal_uInt16
nId
,
ToolBox
&
rTbx
)
:
SfxToolBoxControl
(
nSlotId
,
nId
,
rTbx
)
{
rTbx
.
SetItemBits
(
nId
,
ToolBoxItemBits
::
DROPDOWNONLY
|
rTbx
.
GetItemBits
(
nId
)
);
}
SvxSubToolBoxControl
::~
SvxSubToolBoxControl
()
{
}
VclPtr
<
SfxPopupWindow
>
SvxSubToolBoxControl
::
CreatePopupWindow
()
{
const
sal_Char
*
pResource
=
0
;
switch
(
GetSlotId
()
)
{
case
SID_OPTIMIZE_TABLE
:
pResource
=
"private:resource/toolbar/optimizetablebar"
;
break
;
}
if
(
pResource
)
createAndPositionSubToolBar
(
OUString
::
createFromAscii
(
pResource
)
);
return
NULL
;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
sw/Library_sw.mk
Dosyayı görüntüle @
d311b65f
...
...
@@ -643,7 +643,6 @@ $(eval $(call gb_Library_add_exception_objects,sw,\
sw/source/uibase/ribbar/drawbase \
sw/source/uibase/ribbar/dselect \
sw/source/uibase/ribbar/inputwin \
sw/source/uibase/ribbar/tblctrl \
sw/source/uibase/ribbar/tbxanchr \
sw/source/uibase/ribbar/workctrl \
sw/source/uibase/shells/annotsh \
...
...
sw/sdi/swriter.sdi
Dosyayı görüntüle @
d311b65f
...
...
@@ -5954,7 +5954,7 @@ SfxBoolItem OnlineAutoFormat FN_AUTOFORMAT_AUTO
GroupId = GID_FORMAT;
]
Sfx
UInt16
Item OptimizeTable FN_OPTIMIZE_TABLE
Sfx
Void
Item OptimizeTable FN_OPTIMIZE_TABLE
[
/* flags: */
...
...
sw/source/uibase/app/swmodule.cxx
Dosyayı görüntüle @
d311b65f
...
...
@@ -94,7 +94,6 @@
#include <tmplctrl.hxx>
#include <viewlayoutctrl.hxx>
#include <svx/zoomsliderctrl.hxx>
#include <tblctrl.hxx>
#include <zoomctrl.hxx>
#include <wordcountctrl.hxx>
#include <workctrl.hxx>
...
...
@@ -342,8 +341,6 @@ void SwDLL::RegisterControls()
SvxModifyControl
::
RegisterControl
(
SID_DOC_MODIFIED
,
pMod
);
SvxZoomSliderControl
::
RegisterControl
(
SID_ATTR_ZOOMSLIDER
,
pMod
);
SwTableOptimizeCtrl
::
RegisterControl
(
FN_OPTIMIZE_TABLE
,
pMod
);
SvxIMapDlgChildWindow
::
RegisterChildWindow
(
false
,
pMod
);
SvxSearchDialogWrapper
::
RegisterChildWindow
(
false
,
pMod
);
SvxHlinkDlgWrapper
::
RegisterChildWindow
(
false
,
pMod
);
...
...
sw/source/uibase/inc/tblctrl.hxx
deleted
100644 → 0
Dosyayı görüntüle @
489af4ed
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_TBLCTRL_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_TBLCTRL_HXX
#include <sfx2/tbxctrl.hxx>
class
SwTableOptimizeCtrl
:
public
SfxToolBoxControl
{
public
:
SFX_DECL_TOOLBOX_CONTROL
();
SwTableOptimizeCtrl
(
sal_uInt16
nSlotId
,
sal_uInt16
nId
,
ToolBox
&
rTbx
);
virtual
~
SwTableOptimizeCtrl
();
virtual
VclPtr
<
SfxPopupWindow
>
CreatePopupWindow
()
SAL_OVERRIDE
;
};
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
sw/source/uibase/ribbar/tblctrl.cxx
deleted
100644 → 0
Dosyayı görüntüle @
489af4ed
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <svl/intitem.hxx>
#include <vcl/toolbox.hxx>
#include <sfx2/app.hxx>
#include "cmdid.h"
#include "swtypes.hxx"
#include "tblctrl.hxx"
SFX_IMPL_TOOLBOX_CONTROL
(
SwTableOptimizeCtrl
,
SfxUInt16Item
);
SwTableOptimizeCtrl
::
SwTableOptimizeCtrl
(
sal_uInt16
nSlotId
,
sal_uInt16
nId
,
ToolBox
&
rTbx
)
:
SfxToolBoxControl
(
nSlotId
,
nId
,
rTbx
)
{
rTbx
.
SetItemBits
(
nId
,
ToolBoxItemBits
::
DROPDOWNONLY
|
rTbx
.
GetItemBits
(
nId
)
);
}
SwTableOptimizeCtrl
::~
SwTableOptimizeCtrl
()
{
}
VclPtr
<
SfxPopupWindow
>
SwTableOptimizeCtrl
::
CreatePopupWindow
()
{
createAndPositionSubToolBar
(
"private:resource/toolbar/optimizetablebar"
);
return
NULL
;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment