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
204555c1
Kaydet (Commit)
204555c1
authored
May 14, 2012
tarafından
Kohei Yoshida
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Renamed FILE to DOCINFO_TITLE, which is more appropriate for this field.
Change-Id: I1267629da8b66fc21c4ae2e78634c2093274aa61
üst
82b04504
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
21 additions
and
20 deletions
+21
-20
flditem.hxx
editeng/inc/editeng/flditem.hxx
+1
-1
core-test.cxx
editeng/qa/unit/core-test.cxx
+1
-1
flditem.cxx
editeng/source/items/flditem.cxx
+1
-1
unofield.cxx
editeng/source/uno/unofield.cxx
+4
-4
Type.idl
offapi/com/sun/star/text/textfield/Type.idl
+7
-6
editutil.cxx
sc/source/core/tool/editutil.cxx
+2
-2
fielduno.cxx
sc/source/ui/unoobj/fielduno.cxx
+4
-4
servuno.cxx
sc/source/ui/unoobj/servuno.cxx
+1
-1
No files found.
editeng/inc/editeng/flditem.hxx
Dosyayı görüntüle @
204555c1
...
@@ -223,7 +223,7 @@ public:
...
@@ -223,7 +223,7 @@ public:
class
EDITENG_DLLPUBLIC
SvxFileField
:
public
SvxFieldData
class
EDITENG_DLLPUBLIC
SvxFileField
:
public
SvxFieldData
{
{
public
:
public
:
SV_DECL_PERSIST1
(
SvxFileField
,
SvxFieldData
,
com
::
sun
::
star
::
text
::
textfield
::
Type
::
FI
LE
)
SV_DECL_PERSIST1
(
SvxFileField
,
SvxFieldData
,
com
::
sun
::
star
::
text
::
textfield
::
Type
::
DOCINFO_TIT
LE
)
SvxFileField
();
SvxFileField
();
virtual
SvxFieldData
*
Clone
()
const
;
virtual
SvxFieldData
*
Clone
()
const
;
...
...
editeng/qa/unit/core-test.cxx
Dosyayı görüntüle @
204555c1
...
@@ -153,7 +153,7 @@ void Test::testUnoTextFields()
...
@@ -153,7 +153,7 @@ void Test::testUnoTextFields()
{
{
// FILE
// FILE
SvxUnoTextField
aField
(
text
::
textfield
::
Type
::
FI
LE
);
SvxUnoTextField
aField
(
text
::
textfield
::
Type
::
DOCINFO_TIT
LE
);
uno
::
Sequence
<
rtl
::
OUString
>
aSvcs
=
aField
.
getSupportedServiceNames
();
uno
::
Sequence
<
rtl
::
OUString
>
aSvcs
=
aField
.
getSupportedServiceNames
();
bool
bGood
=
includes
(
aSvcs
,
"com.sun.star.text.textfield.docinfo.Title"
);
bool
bGood
=
includes
(
aSvcs
,
"com.sun.star.text.textfield.docinfo.Title"
);
CPPUNIT_ASSERT_MESSAGE
(
"expected service is not present."
,
bGood
);
CPPUNIT_ASSERT_MESSAGE
(
"expected service is not present."
,
bGood
);
...
...
editeng/source/items/flditem.cxx
Dosyayı görüntüle @
204555c1
...
@@ -122,7 +122,7 @@ SvxFieldData* SvxFieldData::Create(const uno::Reference<text::XTextContent>& xTe
...
@@ -122,7 +122,7 @@ SvxFieldData* SvxFieldData::Create(const uno::Reference<text::XTextContent>& xTe
return
new
SvxPageField
();
return
new
SvxPageField
();
case
text
:
:
textfield
::
Type
::
PAGES
:
case
text
:
:
textfield
::
Type
::
PAGES
:
return
new
SvxPagesField
();
return
new
SvxPagesField
();
case
text
:
:
textfield
::
Type
::
FI
LE
:
case
text
:
:
textfield
::
Type
::
DOCINFO_TIT
LE
:
return
new
SvxFileField
();
return
new
SvxFileField
();
case
text
:
:
textfield
::
Type
::
TABLE
:
case
text
:
:
textfield
::
Type
::
TABLE
:
{
{
...
...
editeng/source/uno/unofield.cxx
Dosyayı görüntüle @
204555c1
...
@@ -442,7 +442,7 @@ SvxFieldData* SvxUnoTextField::CreateFieldData() const throw()
...
@@ -442,7 +442,7 @@ SvxFieldData* SvxUnoTextField::CreateFieldData() const throw()
pData
=
new
SvxPagesField
();
pData
=
new
SvxPagesField
();
break
;
break
;
case
text
:
:
textfield
::
Type
::
FI
LE
:
case
text
:
:
textfield
::
Type
::
DOCINFO_TIT
LE
:
pData
=
new
SvxFileField
();
pData
=
new
SvxFileField
();
break
;
break
;
...
@@ -608,7 +608,7 @@ OUString SAL_CALL SvxUnoTextField::getPresentation( sal_Bool bShowCommand )
...
@@ -608,7 +608,7 @@ OUString SAL_CALL SvxUnoTextField::getPresentation( sal_Bool bShowCommand )
return
OUString
(
"Pages"
);
return
OUString
(
"Pages"
);
case
text
:
:
textfield
::
Type
::
TIME
:
case
text
:
:
textfield
::
Type
::
TIME
:
return
OUString
(
"Time"
);
return
OUString
(
"Time"
);
case
text
:
:
textfield
::
Type
::
FI
LE
:
case
text
:
:
textfield
::
Type
::
DOCINFO_TIT
LE
:
return
OUString
(
"File"
);
return
OUString
(
"File"
);
case
text
:
:
textfield
::
Type
::
TABLE
:
case
text
:
:
textfield
::
Type
::
TABLE
:
return
OUString
(
"Table"
);
return
OUString
(
"Table"
);
...
@@ -837,7 +837,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoTextField::getSupportedServiceNames()
...
@@ -837,7 +837,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoTextField::getSupportedServiceNames()
pServices
[
2
]
=
"com.sun.star.text.TextField.DateTime"
;
pServices
[
2
]
=
"com.sun.star.text.TextField.DateTime"
;
pServices
[
3
]
=
"com.sun.star.text.textfield.DateTime"
;
pServices
[
3
]
=
"com.sun.star.text.textfield.DateTime"
;
break
;
break
;
case
text
:
:
textfield
::
Type
::
FI
LE
:
case
text
:
:
textfield
::
Type
::
DOCINFO_TIT
LE
:
pServices
[
2
]
=
"com.sun.star.text.TextField.docinfo.Title"
;
pServices
[
2
]
=
"com.sun.star.text.TextField.docinfo.Title"
;
pServices
[
3
]
=
"com.sun.star.text.textfield.docinfo.Title"
;
pServices
[
3
]
=
"com.sun.star.text.textfield.docinfo.Title"
;
break
;
break
;
...
@@ -931,7 +931,7 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoTextCreateTextField( const ::rt
...
@@ -931,7 +931,7 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoTextCreateTextField( const ::rt
aFieldType
.
equalsAsciiL
(
aFieldType
.
equalsAsciiL
(
RTL_CONSTASCII_STRINGPARAM
(
"DocInfo.Title"
)
)
)
RTL_CONSTASCII_STRINGPARAM
(
"DocInfo.Title"
)
)
)
{
{
nId
=
text
::
textfield
::
Type
::
FI
LE
;
nId
=
text
::
textfield
::
Type
::
DOCINFO_TIT
LE
;
}
}
else
if
(
aFieldType
==
"Author"
)
else
if
(
aFieldType
==
"Author"
)
{
{
...
...
offapi/com/sun/star/text/textfield/Type.idl
Dosyayı görüntüle @
204555c1
...
@@ -50,12 +50,13 @@ constants Type
...
@@ -50,12 +50,13 @@ constants Type
const
long
PAGE
=
2
;
const
long
PAGE
=
2
;
const
long
PAGES
=
3
;
const
long
PAGES
=
3
;
const
long
TIME
=
4
;
const
long
TIME
=
4
;
const
long
FILE
=
5
;
const
long
TABLE
=
5
;
const
long
TABLE
=
6
;
const
long
EXTENDED_TIME
=
6
;
const
long
EXTENDED_TIME
=
7
;
const
long
EXTENDED_FILE
=
7
;
const
long
EXTENDED_FILE
=
8
;
const
long
AUTHOR
=
8
;
const
long
AUTHOR
=
9
;
const
long
MEASURE
=
9
;
const
long
MEASURE
=
10
;
const
long
DOCINFO_TITLE
=
10
;
const
long
PRESENTATION_HEADER
=
11
;
const
long
PRESENTATION_HEADER
=
11
;
const
long
PRESENTATION_FOOTER
=
12
;
const
long
PRESENTATION_FOOTER
=
12
;
...
...
sc/source/core/tool/editutil.cxx
Dosyayı görüntüle @
204555c1
...
@@ -670,7 +670,7 @@ String ScHeaderEditEngine::CalcFieldValue( const SvxFieldItem& rField,
...
@@ -670,7 +670,7 @@ String ScHeaderEditEngine::CalcFieldValue( const SvxFieldItem& rField,
case
text
:
:
textfield
::
Type
::
TIME
:
case
text
:
:
textfield
::
Type
::
TIME
:
aRet
=
ScGlobal
::
pLocaleData
->
getTime
(
aData
.
aTime
);
aRet
=
ScGlobal
::
pLocaleData
->
getTime
(
aData
.
aTime
);
break
;
break
;
case
text
:
:
textfield
::
Type
::
FI
LE
:
case
text
:
:
textfield
::
Type
::
DOCINFO_TIT
LE
:
aRet
=
aData
.
aTitle
;
aRet
=
aData
.
aTitle
;
break
;
break
;
case
text
:
:
textfield
::
Type
::
EXTENDED_FILE
:
case
text
:
:
textfield
::
Type
::
EXTENDED_FILE
:
...
@@ -766,7 +766,7 @@ String ScFieldEditEngine::CalcFieldValue( const SvxFieldItem& rField,
...
@@ -766,7 +766,7 @@ String ScFieldEditEngine::CalcFieldValue( const SvxFieldItem& rField,
aRet
=
ScGlobal
::
pLocaleData
->
getDate
(
aDate
);
aRet
=
ScGlobal
::
pLocaleData
->
getDate
(
aDate
);
}
}
break
;
break
;
case
text
:
:
textfield
::
Type
::
FI
LE
:
case
text
:
:
textfield
::
Type
::
DOCINFO_TIT
LE
:
{
{
SfxObjectShell
*
pDocShell
=
mpDoc
->
GetDocumentShell
();
SfxObjectShell
*
pDocShell
=
mpDoc
->
GetDocumentShell
();
aRet
=
pDocShell
->
getDocProperties
()
->
getTitle
();
aRet
=
pDocShell
->
getDocProperties
()
->
getTitle
();
...
...
sc/source/ui/unoobj/fielduno.cxx
Dosyayı görüntüle @
204555c1
...
@@ -693,7 +693,7 @@ SvxFieldData* ScEditFieldObj::getData()
...
@@ -693,7 +693,7 @@ SvxFieldData* ScEditFieldObj::getData()
mpData
.
reset
(
new
SvxExtTimeField
);
mpData
.
reset
(
new
SvxExtTimeField
);
}
}
break
;
break
;
case
text
:
:
textfield
::
Type
::
FI
LE
:
case
text
:
:
textfield
::
Type
::
DOCINFO_TIT
LE
:
mpData
.
reset
(
new
SvxFileField
);
mpData
.
reset
(
new
SvxFileField
);
break
;
break
;
case
text
:
:
textfield
::
Type
::
URL
:
case
text
:
:
textfield
::
Type
::
URL
:
...
@@ -1156,7 +1156,7 @@ ScEditFieldObj::ScEditFieldObj(
...
@@ -1156,7 +1156,7 @@ ScEditFieldObj::ScEditFieldObj(
{
{
switch
(
meType
)
switch
(
meType
)
{
{
case
text
:
:
textfield
::
Type
::
FI
LE
:
case
text
:
:
textfield
::
Type
::
DOCINFO_TIT
LE
:
pPropSet
=
getEmptyPropertySet
();
pPropSet
=
getEmptyPropertySet
();
break
;
break
;
case
text
:
:
textfield
::
Type
::
EXTENDED_FILE
:
case
text
:
:
textfield
::
Type
::
EXTENDED_FILE
:
...
@@ -1349,7 +1349,7 @@ void SAL_CALL ScEditFieldObj::setPropertyValue(
...
@@ -1349,7 +1349,7 @@ void SAL_CALL ScEditFieldObj::setPropertyValue(
case
text
:
:
textfield
::
Type
::
TABLE
:
case
text
:
:
textfield
::
Type
::
TABLE
:
setPropertyValueSheet
(
aPropertyName
,
aValue
);
setPropertyValueSheet
(
aPropertyName
,
aValue
);
break
;
break
;
case
text
:
:
textfield
::
Type
::
FI
LE
:
case
text
:
:
textfield
::
Type
::
DOCINFO_TIT
LE
:
default
:
default
:
throw
beans
::
UnknownPropertyException
();
throw
beans
::
UnknownPropertyException
();
}
}
...
@@ -1397,7 +1397,7 @@ uno::Any SAL_CALL ScEditFieldObj::getPropertyValue( const rtl::OUString& aProper
...
@@ -1397,7 +1397,7 @@ uno::Any SAL_CALL ScEditFieldObj::getPropertyValue( const rtl::OUString& aProper
case
text
:
:
textfield
::
Type
::
TIME
:
case
text
:
:
textfield
::
Type
::
TIME
:
case
text
:
:
textfield
::
Type
::
EXTENDED_TIME
:
case
text
:
:
textfield
::
Type
::
EXTENDED_TIME
:
return
getPropertyValueDateTime
(
aPropertyName
);
return
getPropertyValueDateTime
(
aPropertyName
);
case
text
:
:
textfield
::
Type
::
FI
LE
:
case
text
:
:
textfield
::
Type
::
DOCINFO_TIT
LE
:
default
:
default
:
throw
beans
::
UnknownPropertyException
();
throw
beans
::
UnknownPropertyException
();
}
}
...
...
sc/source/ui/unoobj/servuno.cxx
Dosyayı görüntüle @
204555c1
...
@@ -441,7 +441,7 @@ sal_Int32 getFieldType(sal_uInt16 nOldType)
...
@@ -441,7 +441,7 @@ sal_Int32 getFieldType(sal_uInt16 nOldType)
case
SC_SERVICE_EXT_TIMEFIELD
:
case
SC_SERVICE_EXT_TIMEFIELD
:
return
text
::
textfield
::
Type
::
EXTENDED_TIME
;
return
text
::
textfield
::
Type
::
EXTENDED_TIME
;
case
SC_SERVICE_TITLEFIELD
:
case
SC_SERVICE_TITLEFIELD
:
return
text
::
textfield
::
Type
::
FI
LE
;
return
text
::
textfield
::
Type
::
DOCINFO_TIT
LE
;
case
SC_SERVICE_FILEFIELD
:
case
SC_SERVICE_FILEFIELD
:
return
text
::
textfield
::
Type
::
EXTENDED_FILE
;
return
text
::
textfield
::
Type
::
EXTENDED_FILE
;
case
SC_SERVICE_SHEETFIELD
:
case
SC_SERVICE_SHEETFIELD
:
...
...
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