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
6296abc1
Kaydet (Commit)
6296abc1
authored
Şub 03, 2017
tarafından
Maxim Monastirsky
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
HelpURL toolbar property is unused
Change-Id: I74b22509f59899b7c15aa791a01c60c8d982221f
üst
89b57084
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
47 deletions
+11
-47
toolbar.dtd
framework/dtd/toolbar.dtd
+0
-1
toolboxconfigurationdefines.hxx
framework/inc/xml/toolboxconfigurationdefines.hxx
+0
-1
toolboxdocumenthandler.hxx
framework/inc/xml/toolboxdocumenthandler.hxx
+1
-4
toolboxdocumenthandler.cxx
framework/source/fwe/xml/toolboxdocumenthandler.cxx
+10
-38
toolbarmanager.cxx
framework/source/uielement/toolbarmanager.cxx
+0
-3
No files found.
framework/dtd/toolbar.dtd
Dosyayı görüntüle @
6296abc1
...
...
@@ -30,7 +30,6 @@
xlink:href CDATA #REQUIRED
toolbar:visible %boolean; "true"
toolbar:style CDATA #IMPLIED
toolbar:helpid CDATA #IMPLIED
>
<!ELEMENT toolbar:toolbarspace EMPTY>
<!ELEMENT toolbar:toolbarbreak EMPTY>
...
...
framework/inc/xml/toolboxconfigurationdefines.hxx
Dosyayı görüntüle @
6296abc1
...
...
@@ -37,7 +37,6 @@
#define ATTRIBUTE_TEXT "text"
#define ATTRIBUTE_URL "href"
#define ATTRIBUTE_VISIBLE "visible"
#define ATTRIBUTE_HELPID "helpid"
#define ATTRIBUTE_ITEMSTYLE "style"
#define ELEMENT_NS_TOOLBAR "toolbar:toolbar"
...
...
framework/inc/xml/toolboxdocumenthandler.hxx
Dosyayı görüntüle @
6296abc1
...
...
@@ -48,7 +48,6 @@ class FWE_DLLPUBLIC OReadToolBoxDocumentHandler :
TB_ATTRIBUTE_TEXT
,
TB_ATTRIBUTE_URL
,
TB_ATTRIBUTE_VISIBLE
,
TB_ATTRIBUTE_HELPID
,
TB_ATTRIBUTE_STYLE
,
TB_ATTRIBUTE_UINAME
,
TB_XML_ENTRY_COUNT
...
...
@@ -114,7 +113,6 @@ class FWE_DLLPUBLIC OReadToolBoxDocumentHandler :
OUString
m_aType
;
OUString
m_aLabel
;
OUString
m_aStyle
;
OUString
m_aHelpURL
;
OUString
m_aIsVisible
;
OUString
m_aCommandURL
;
};
...
...
@@ -134,8 +132,7 @@ class FWE_DLLPUBLIC OWriteToolBoxDocumentHandler final
private
:
/// @throws css::xml::sax::SAXException
/// @throws css::uno::RuntimeException
void
WriteToolBoxItem
(
const
OUString
&
aCommandURL
,
const
OUString
&
aLabel
,
const
OUString
&
aHelpURL
,
sal_Int16
nStyle
,
bool
bVisible
);
void
WriteToolBoxItem
(
const
OUString
&
aCommandURL
,
const
OUString
&
aLabel
,
sal_Int16
nStyle
,
bool
bVisible
);
/// @throws css::xml::sax::SAXException
/// @throws css::uno::RuntimeException
...
...
framework/source/fwe/xml/toolboxdocumenthandler.cxx
Dosyayı görüntüle @
6296abc1
...
...
@@ -35,6 +35,7 @@
#include <rtl/ustrbuf.hxx>
#include <comphelper/attributelist.hxx>
#include <comphelper/propertysequence.hxx>
using
namespace
::
com
::
sun
::
star
::
uno
;
using
namespace
::
com
::
sun
::
star
::
beans
;
...
...
@@ -48,7 +49,6 @@ namespace framework
// Property names of a menu/menu item ItemDescriptor
static
const
char
ITEM_DESCRIPTOR_COMMANDURL
[]
=
"CommandURL"
;
static
const
char
ITEM_DESCRIPTOR_HELPURL
[]
=
"HelpURL"
;
static
const
char
ITEM_DESCRIPTOR_LABEL
[]
=
"Label"
;
static
const
char
ITEM_DESCRIPTOR_TYPE
[]
=
"Type"
;
static
const
char
ITEM_DESCRIPTOR_STYLE
[]
=
"Style"
;
...
...
@@ -57,7 +57,6 @@ static const char ITEM_DESCRIPTOR_VISIBLE[] = "IsVisible";
static
void
ExtractToolbarParameters
(
const
Sequence
<
PropertyValue
>&
rProp
,
OUString
&
rCommandURL
,
OUString
&
rLabel
,
OUString
&
rHelpURL
,
sal_Int16
&
rStyle
,
bool
&
rVisible
,
sal_Int16
&
rType
)
...
...
@@ -69,8 +68,6 @@ static void ExtractToolbarParameters( const Sequence< PropertyValue >& rProp,
rProp
[
i
].
Value
>>=
rCommandURL
;
rCommandURL
=
rCommandURL
.
intern
();
}
else
if
(
rProp
[
i
].
Name
==
ITEM_DESCRIPTOR_HELPURL
)
rProp
[
i
].
Value
>>=
rHelpURL
;
else
if
(
rProp
[
i
].
Name
==
ITEM_DESCRIPTOR_LABEL
)
rProp
[
i
].
Value
>>=
rLabel
;
else
if
(
rProp
[
i
].
Name
==
ITEM_DESCRIPTOR_TYPE
)
...
...
@@ -117,7 +114,6 @@ ToolBarEntryProperty const ToolBoxEntries[OReadToolBoxDocumentHandler::TB_XML_EN
{
OReadToolBoxDocumentHandler
::
TB_NS_TOOLBAR
,
ATTRIBUTE_TEXT
},
{
OReadToolBoxDocumentHandler
::
TB_NS_XLINK
,
ATTRIBUTE_URL
},
{
OReadToolBoxDocumentHandler
::
TB_NS_TOOLBAR
,
ATTRIBUTE_VISIBLE
},
{
OReadToolBoxDocumentHandler
::
TB_NS_TOOLBAR
,
ATTRIBUTE_HELPID
},
{
OReadToolBoxDocumentHandler
::
TB_NS_TOOLBAR
,
ATTRIBUTE_ITEMSTYLE
},
{
OReadToolBoxDocumentHandler
::
TB_NS_TOOLBAR
,
ATTRIBUTE_UINAME
},
};
...
...
@@ -127,7 +123,6 @@ OReadToolBoxDocumentHandler::OReadToolBoxDocumentHandler( const Reference< XInde
m_aType
(
ITEM_DESCRIPTOR_TYPE
),
m_aLabel
(
ITEM_DESCRIPTOR_LABEL
),
m_aStyle
(
ITEM_DESCRIPTOR_STYLE
),
m_aHelpURL
(
ITEM_DESCRIPTOR_HELPURL
),
m_aIsVisible
(
ITEM_DESCRIPTOR_VISIBLE
),
m_aCommandURL
(
ITEM_DESCRIPTOR_COMMANDURL
)
{
...
...
@@ -275,7 +270,6 @@ void SAL_CALL OReadToolBoxDocumentHandler::startElement(
m_bToolBarItemStartFound
=
true
;
OUString
aLabel
;
OUString
aCommandURL
;
OUString
aHelpURL
;
sal_uInt16
nItemBits
(
0
);
bool
bVisible
(
true
);
...
...
@@ -314,12 +308,6 @@ void SAL_CALL OReadToolBoxDocumentHandler::startElement(
}
break
;
case
TB_ATTRIBUTE_HELPID
:
{
aHelpURL
=
xAttribs
->
getValueByIndex
(
n
);
}
break
;
case
TB_ATTRIBUTE_STYLE
:
{
// read space separated item style list
...
...
@@ -369,14 +357,6 @@ void SAL_CALL OReadToolBoxDocumentHandler::startElement(
if
(
!
aCommandURL
.
isEmpty
()
)
{
Sequence
<
PropertyValue
>
aToolbarItemProp
(
6
);
aToolbarItemProp
[
0
].
Name
=
m_aCommandURL
;
aToolbarItemProp
[
1
].
Name
=
m_aHelpURL
;
aToolbarItemProp
[
2
].
Name
=
m_aLabel
;
aToolbarItemProp
[
3
].
Name
=
m_aType
;
aToolbarItemProp
[
4
].
Name
=
m_aStyle
;
aToolbarItemProp
[
5
].
Name
=
m_aIsVisible
;
//fix for fdo#39370
/// check whether RTL interface or not
if
(
AllSettings
::
GetLayoutRTL
()){
...
...
@@ -394,12 +374,13 @@ void SAL_CALL OReadToolBoxDocumentHandler::startElement(
aCommandURL
=
".uno:AlignLeft"
;
}
aToolbarItemProp
[
0
].
Value
<<=
aCommandURL
;
aToolbarItemProp
[
1
].
Value
<<=
aHelpURL
;
aToolbarItemProp
[
2
].
Value
<<=
aLabel
;
aToolbarItemProp
[
3
].
Value
=
makeAny
(
css
::
ui
::
ItemType
::
DEFAULT
);
aToolbarItemProp
[
4
].
Value
<<=
nItemBits
;
aToolbarItemProp
[
5
].
Value
<<=
bVisible
;
auto
aToolbarItemProp
(
comphelper
::
InitPropertySequence
(
{
{
m_aCommandURL
,
css
::
uno
::
makeAny
(
aCommandURL
)
},
{
m_aLabel
,
css
::
uno
::
makeAny
(
aLabel
)
},
{
m_aType
,
css
::
uno
::
makeAny
(
css
::
ui
::
ItemType
::
DEFAULT
)
},
{
m_aStyle
,
css
::
uno
::
makeAny
(
nItemBits
)
},
{
m_aIsVisible
,
css
::
uno
::
makeAny
(
bVisible
)
},
}
)
);
m_rItemContainer
->
insertByIndex
(
m_rItemContainer
->
getCount
(),
makeAny
(
aToolbarItemProp
)
);
}
...
...
@@ -678,14 +659,13 @@ void OWriteToolBoxDocumentHandler::WriteToolBoxDocument()
{
OUString
aCommandURL
;
OUString
aLabel
;
OUString
aHelpURL
;
bool
bVisible
(
true
);
sal_Int16
nType
(
css
::
ui
::
ItemType
::
DEFAULT
);
sal_Int16
nStyle
(
0
);
ExtractToolbarParameters
(
aProps
,
aCommandURL
,
aLabel
,
aHelpURL
,
nStyle
,
bVisible
,
nType
);
ExtractToolbarParameters
(
aProps
,
aCommandURL
,
aLabel
,
nStyle
,
bVisible
,
nType
);
if
(
nType
==
css
::
ui
::
ItemType
::
DEFAULT
)
WriteToolBoxItem
(
aCommandURL
,
aLabel
,
aHelpURL
,
nStyle
,
bVisible
);
WriteToolBoxItem
(
aCommandURL
,
aLabel
,
nStyle
,
bVisible
);
else
if
(
nType
==
css
::
ui
::
ItemType
::
SEPARATOR_SPACE
)
WriteToolBoxSpace
();
else
if
(
nType
==
css
::
ui
::
ItemType
::
SEPARATOR_LINE
)
...
...
@@ -706,7 +686,6 @@ void OWriteToolBoxDocumentHandler::WriteToolBoxDocument()
void
OWriteToolBoxDocumentHandler
::
WriteToolBoxItem
(
const
OUString
&
rCommandURL
,
const
OUString
&
rLabel
,
const
OUString
&
rHelpURL
,
sal_Int16
nStyle
,
bool
bVisible
)
{
...
...
@@ -735,13 +714,6 @@ void OWriteToolBoxDocumentHandler::WriteToolBoxItem(
ATTRIBUTE_BOOLEAN_FALSE
);
}
if
(
!
rHelpURL
.
isEmpty
()
)
{
pList
->
AddAttribute
(
m_aXMLToolbarNS
+
ATTRIBUTE_HELPID
,
m_aAttributeType
,
rHelpURL
);
}
if
(
nStyle
>
0
)
{
OUString
aValue
;
...
...
framework/source/uielement/toolbarmanager.cxx
Dosyayı görüntüle @
6296abc1
...
...
@@ -984,7 +984,6 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
Sequence
<
PropertyValue
>
aProp
;
OUString
aCommandURL
;
OUString
aLabel
;
OUString
aHelpURL
;
sal_uInt16
nType
(
css
::
ui
::
ItemType
::
DEFAULT
);
sal_uInt32
nStyle
(
0
);
...
...
@@ -1034,8 +1033,6 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
}
}
}
else
if
(
aProp
[
i
].
Name
==
"HelpURL"
)
aProp
[
i
].
Value
>>=
aHelpURL
;
else
if
(
aProp
[
i
].
Name
==
"Label"
)
aProp
[
i
].
Value
>>=
aLabel
;
else
if
(
aProp
[
i
].
Name
==
"Type"
)
...
...
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