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
6cd581f2
Kaydet (Commit)
6cd581f2
authored
Ock 20, 2012
tarafından
Stephan Bergmann
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Code clean up.
üst
b855cd62
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
23 additions
and
30 deletions
+23
-30
options.hxx
unodevtools/inc/unodevtools/options.hxx
+2
-2
cppcompskeleton.cxx
unodevtools/source/skeletonmaker/cppcompskeleton.cxx
+5
-7
javacompskeleton.cxx
unodevtools/source/skeletonmaker/javacompskeleton.cxx
+3
-6
javatypemaker.cxx
unodevtools/source/skeletonmaker/javatypemaker.cxx
+1
-1
skeletoncpp.hxx
unodevtools/source/skeletonmaker/skeletoncpp.hxx
+1
-2
skeletonjava.hxx
unodevtools/source/skeletonmaker/skeletonjava.hxx
+2
-3
skeletonmaker.cxx
unodevtools/source/skeletonmaker/skeletonmaker.cxx
+6
-6
options.cxx
unodevtools/source/unodevtools/options.cxx
+3
-3
No files found.
unodevtools/inc/unodevtools/options.hxx
Dosyayı görüntüle @
6cd581f2
...
@@ -39,12 +39,12 @@ namespace unodevtools {
...
@@ -39,12 +39,12 @@ namespace unodevtools {
//-------------------------------------------------------------------------------
//-------------------------------------------------------------------------------
sal_Bool
readOption
(
rtl
::
OUString
*
pValue
,
const
sal_Char
*
pOpt
,
sal_Bool
readOption
(
rtl
::
OUString
*
pValue
,
const
sal_Char
*
pOpt
,
sal_Int32
*
pnIndex
,
const
rtl
::
OUString
&
aArg
)
sal_
u
Int32
*
pnIndex
,
const
rtl
::
OUString
&
aArg
)
throw
(
com
::
sun
::
star
::
uno
::
RuntimeException
);
throw
(
com
::
sun
::
star
::
uno
::
RuntimeException
);
//-------------------------------------------------------------------------------
//-------------------------------------------------------------------------------
sal_Bool
readOption
(
sal_Bool
*
pbOpt
,
const
sal_Char
*
pOpt
,
sal_Bool
readOption
(
sal_Bool
*
pbOpt
,
const
sal_Char
*
pOpt
,
sal_Int32
*
pnIndex
,
const
rtl
::
OUString
&
aArg
);
sal_
u
Int32
*
pnIndex
,
const
rtl
::
OUString
&
aArg
);
}
// end of namespace unodevtools
}
// end of namespace unodevtools
...
...
unodevtools/source/skeletonmaker/cppcompskeleton.cxx
Dosyayı görüntüle @
6cd581f2
...
@@ -41,7 +41,6 @@ namespace skeletonmaker { namespace cpp {
...
@@ -41,7 +41,6 @@ namespace skeletonmaker { namespace cpp {
void
generateIncludes
(
std
::
ostream
&
o
,
void
generateIncludes
(
std
::
ostream
&
o
,
const
boost
::
unordered_set
<
OString
,
OStringHash
>&
interfaces
,
const
boost
::
unordered_set
<
OString
,
OStringHash
>&
interfaces
,
const
AttributeInfo
&
/*properties*/
,
OString
propertyhelper
,
bool
serviceobject
,
OString
propertyhelper
,
bool
serviceobject
,
bool
supportxcomponent
)
bool
supportxcomponent
)
{
{
...
@@ -968,8 +967,7 @@ void generateQueryInterface(std::ostream& o,
...
@@ -968,8 +967,7 @@ void generateQueryInterface(std::ostream& o,
void
generateSkeleton
(
ProgramOptions
const
&
options
,
void
generateSkeleton
(
ProgramOptions
const
&
options
,
TypeManager
const
&
manager
,
TypeManager
const
&
manager
,
std
::
vector
<
OString
>
const
&
types
,
std
::
vector
<
OString
>
const
&
types
)
OString
const
&
/*delegate*/
)
{
{
// special handling of calc add-ins
// special handling of calc add-ins
if
(
options
.
componenttype
==
2
)
{
if
(
options
.
componenttype
==
2
)
{
...
@@ -1030,8 +1028,8 @@ void generateSkeleton(ProgramOptions const & options,
...
@@ -1030,8 +1028,8 @@ void generateSkeleton(ProgramOptions const & options,
printLicenseHeader
(
*
pofs
,
compFileName
);
printLicenseHeader
(
*
pofs
,
compFileName
);
}
}
generateIncludes
(
*
pofs
,
interfaces
,
propert
ies
,
propertyhelper
,
generateIncludes
(
*
pofs
,
interfaces
,
propert
yhelper
,
serviceobject
,
s
erviceobject
,
s
upportxcomponent
);
supportxcomponent
);
if
(
options
.
componenttype
==
3
)
{
if
(
options
.
componenttype
==
3
)
{
*
pofs
<<
"#include
\"
com/sun/star/frame/XFrame.hpp
\"\n
"
;
*
pofs
<<
"#include
\"
com/sun/star/frame/XFrame.hpp
\"\n
"
;
...
@@ -1192,8 +1190,8 @@ void generateCalcAddin(ProgramOptions const & options,
...
@@ -1192,8 +1190,8 @@ void generateCalcAddin(ProgramOptions const & options,
printLicenseHeader
(
*
pofs
,
compFileName
);
printLicenseHeader
(
*
pofs
,
compFileName
);
}
}
generateIncludes
(
*
pofs
,
interfaces
,
propert
ies
,
propertyhelper
,
generateIncludes
(
*
pofs
,
interfaces
,
propert
yhelper
,
serviceobject
,
s
erviceobject
,
s
upportxcomponent
);
supportxcomponent
);
*
pofs
<<
*
pofs
<<
"#include
\"
com/sun/star/beans/PropertyValue.hpp
\"\n
"
"#include
\"
com/sun/star/beans/PropertyValue.hpp
\"\n
"
...
...
unodevtools/source/skeletonmaker/javacompskeleton.cxx
Dosyayı görüntüle @
6cd581f2
...
@@ -47,7 +47,6 @@ void generatePackage(std::ostream & o, const OString & implname)
...
@@ -47,7 +47,6 @@ void generatePackage(std::ostream & o, const OString & implname)
}
}
void
generateImports
(
std
::
ostream
&
o
,
ProgramOptions
const
&
options
,
void
generateImports
(
std
::
ostream
&
o
,
ProgramOptions
const
&
options
,
const
boost
::
unordered_set
<
OString
,
OStringHash
>&
/*interfaces*/
,
const
OString
&
propertyhelper
,
const
OString
&
propertyhelper
,
bool
serviceobject
,
bool
supportxcomponent
)
bool
serviceobject
,
bool
supportxcomponent
)
{
{
...
@@ -265,7 +264,6 @@ bool checkAttribute(OStringBuffer& attributeValue, sal_uInt16 attribute)
...
@@ -265,7 +264,6 @@ bool checkAttribute(OStringBuffer& attributeValue, sal_uInt16 attribute)
}
}
void
registerProperties
(
std
::
ostream
&
o
,
void
registerProperties
(
std
::
ostream
&
o
,
TypeManager
const
&
/*manager*/
,
const
AttributeInfo
&
properties
,
const
AttributeInfo
&
properties
,
const
OString
&
indentation
)
const
OString
&
indentation
)
{
{
...
@@ -837,7 +835,7 @@ void generateClassDefinition(std::ostream& o,
...
@@ -837,7 +835,7 @@ void generateClassDefinition(std::ostream& o,
o
<<
"
\n
public "
<<
classname
<<
"( XComponentContext context )
\n
"
o
<<
"
\n
public "
<<
classname
<<
"( XComponentContext context )
\n
"
" {
\n
m_xContext = context;
\n
"
;
" {
\n
m_xContext = context;
\n
"
;
if
(
propertyhelper
.
equals
(
"_"
))
{
if
(
propertyhelper
.
equals
(
"_"
))
{
registerProperties
(
o
,
manager
,
properties
,
" "
);
registerProperties
(
o
,
properties
,
" "
);
}
else
{
}
else
{
if
(
propertyhelper
.
getLength
()
>
1
)
{
if
(
propertyhelper
.
getLength
()
>
1
)
{
o
<<
propcomment
o
<<
propcomment
...
@@ -862,8 +860,7 @@ void generateClassDefinition(std::ostream& o,
...
@@ -862,8 +860,7 @@ void generateClassDefinition(std::ostream& o,
void
generateSkeleton
(
ProgramOptions
const
&
options
,
void
generateSkeleton
(
ProgramOptions
const
&
options
,
TypeManager
const
&
manager
,
TypeManager
const
&
manager
,
std
::
vector
<
OString
>
const
&
types
,
std
::
vector
<
OString
>
const
&
types
)
OString
const
&
/*delegate*/
)
{
{
boost
::
unordered_set
<
OString
,
OStringHash
>
interfaces
;
boost
::
unordered_set
<
OString
,
OStringHash
>
interfaces
;
boost
::
unordered_set
<
OString
,
OStringHash
>
services
;
boost
::
unordered_set
<
OString
,
OStringHash
>
services
;
...
@@ -958,7 +955,7 @@ void generateSkeleton(ProgramOptions const & options,
...
@@ -958,7 +955,7 @@ void generateSkeleton(ProgramOptions const & options,
generatePackage
(
*
pofs
,
options
.
implname
);
generatePackage
(
*
pofs
,
options
.
implname
);
generateImports
(
*
pofs
,
options
,
interfaces
,
propertyhelper
,
generateImports
(
*
pofs
,
options
,
propertyhelper
,
serviceobject
,
supportxcomponent
);
serviceobject
,
supportxcomponent
);
OString
classname
(
options
.
implname
);
OString
classname
(
options
.
implname
);
...
...
unodevtools/source/skeletonmaker/javatypemaker.cxx
Dosyayı görüntüle @
6cd581f2
...
@@ -203,7 +203,7 @@ void printConstructor(std::ostream & o,
...
@@ -203,7 +203,7 @@ void printConstructor(std::ostream & o,
void
printMethodParameters
(
std
::
ostream
&
o
,
void
printMethodParameters
(
std
::
ostream
&
o
,
ProgramOptions
const
&
options
,
TypeManager
const
&
manager
,
ProgramOptions
const
&
options
,
TypeManager
const
&
manager
,
typereg
::
Reader
const
&
reader
,
sal_uInt16
method
,
bool
previous
,
typereg
::
Reader
const
&
reader
,
sal_uInt16
method
,
bool
previous
,
bool
withtype
,
bool
/*shortname*/
)
bool
withtype
)
{
{
for
(
sal_uInt16
i
=
0
;
i
<
reader
.
getMethodParameterCount
(
method
);
++
i
)
{
for
(
sal_uInt16
i
=
0
;
i
<
reader
.
getMethodParameterCount
(
method
);
++
i
)
{
if
(
previous
)
if
(
previous
)
...
...
unodevtools/source/skeletonmaker/skeletoncpp.hxx
Dosyayı görüntüle @
6cd581f2
...
@@ -130,8 +130,7 @@ void generateDocumentation(std::ostream & o,
...
@@ -130,8 +130,7 @@ void generateDocumentation(std::ostream & o,
void
generateSkeleton
(
ProgramOptions
const
&
options
,
void
generateSkeleton
(
ProgramOptions
const
&
options
,
TypeManager
const
&
manager
,
TypeManager
const
&
manager
,
std
::
vector
<
rtl
::
OString
>
const
&
types
,
std
::
vector
<
rtl
::
OString
>
const
&
types
);
rtl
::
OString
const
&
delegate
);
void
generateCalcAddin
(
ProgramOptions
const
&
options
,
void
generateCalcAddin
(
ProgramOptions
const
&
options
,
TypeManager
const
&
manager
,
TypeManager
const
&
manager
,
...
...
unodevtools/source/skeletonmaker/skeletonjava.hxx
Dosyayı görüntüle @
6cd581f2
...
@@ -64,8 +64,7 @@ void printMethodParameters(std::ostream & o,
...
@@ -64,8 +64,7 @@ void printMethodParameters(std::ostream & o,
TypeManager
const
&
manager
,
TypeManager
const
&
manager
,
typereg
::
Reader
const
&
reader
,
typereg
::
Reader
const
&
reader
,
sal_uInt16
method
,
bool
previous
,
sal_uInt16
method
,
bool
previous
,
bool
withtype
,
bool
withtype
);
bool
shortname
=
false
);
void
printExceptionSpecification
(
std
::
ostream
&
o
,
void
printExceptionSpecification
(
std
::
ostream
&
o
,
ProgramOptions
const
&
options
,
ProgramOptions
const
&
options
,
...
@@ -109,7 +108,7 @@ void generateDocumentation(std::ostream & o,
...
@@ -109,7 +108,7 @@ void generateDocumentation(std::ostream & o,
rtl
::
OString
const
&
type
,
rtl
::
OString
const
&
type
,
rtl
::
OString
const
&
delegate
);
rtl
::
OString
const
&
delegate
);
void
generateSkeleton
(
ProgramOptions
const
&
options
,
TypeManager
const
&
manager
,
std
::
vector
<
rtl
::
OString
>
const
&
types
,
rtl
::
OString
const
&
delegate
);
void
generateSkeleton
(
ProgramOptions
const
&
options
,
TypeManager
const
&
manager
,
std
::
vector
<
rtl
::
OString
>
const
&
types
);
}
}
}
}
...
...
unodevtools/source/skeletonmaker/skeletonmaker.cxx
Dosyayı görüntüle @
6cd581f2
...
@@ -141,12 +141,13 @@ void printUsageAndExit(const char* programname, const char* version)
...
@@ -141,12 +141,13 @@ void printUsageAndExit(const char* programname, const char* version)
}
}
SAL_IMPLEMENT_MAIN
_WITH_ARGS
(
argc
,
/*argv*/
)
SAL_IMPLEMENT_MAIN
(
)
{
{
const
char
*
version
=
"0.4"
;
const
char
*
version
=
"0.4"
;
const
char
*
programname
=
"uno-skeletonmaker"
;
const
char
*
programname
=
"uno-skeletonmaker"
;
if
(
argc
<=
1
)
{
sal_uInt32
nCount
=
rtl_getAppCommandArgCount
();
if
(
nCount
==
0
)
{
printUsageAndExit
(
programname
,
version
);
printUsageAndExit
(
programname
,
version
);
exit
(
EXIT_FAILURE
);
exit
(
EXIT_FAILURE
);
}
}
...
@@ -158,8 +159,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, /*argv*/)
...
@@ -158,8 +159,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, /*argv*/)
try
{
try
{
sal_Int32
nPos
=
0
;
sal_uInt32
nPos
=
0
;
sal_Int32
nCount
=
(
sal_Int32
)
rtl_getAppCommandArgCount
();
OUString
arg
,
sOption
;
OUString
arg
,
sOption
;
sal_Bool
bOption
=
sal_False
;
sal_Bool
bOption
=
sal_False
;
...
@@ -327,10 +327,10 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, /*argv*/)
...
@@ -327,10 +327,10 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, /*argv*/)
switch
(
options
.
language
)
switch
(
options
.
language
)
{
{
case
1
:
//Java
case
1
:
//Java
java
::
generateSkeleton
(
options
,
manager
,
types
,
delegate
);
java
::
generateSkeleton
(
options
,
manager
,
types
);
break
;
break
;
case
2
:
//C++
case
2
:
//C++
cpp
::
generateSkeleton
(
options
,
manager
,
types
,
delegate
);
cpp
::
generateSkeleton
(
options
,
manager
,
types
);
break
;
break
;
default
:
default
:
OSL_ASSERT
(
false
);
OSL_ASSERT
(
false
);
...
...
unodevtools/source/unodevtools/options.cxx
Dosyayı görüntüle @
6cd581f2
...
@@ -49,7 +49,7 @@ static void out( const sal_Char * pText )
...
@@ -49,7 +49,7 @@ static void out( const sal_Char * pText )
//-------------------------------------------------------------------------------
//-------------------------------------------------------------------------------
sal_Bool
readOption
(
OUString
*
pValue
,
const
sal_Char
*
pOpt
,
sal_Bool
readOption
(
OUString
*
pValue
,
const
sal_Char
*
pOpt
,
sal_Int32
*
pnIndex
,
const
OUString
&
aArg
)
sal_
u
Int32
*
pnIndex
,
const
OUString
&
aArg
)
throw
(
RuntimeException
)
throw
(
RuntimeException
)
{
{
const
OUString
dash
=
OUString
(
RTL_CONSTASCII_USTRINGPARAM
(
"-"
));
const
OUString
dash
=
OUString
(
RTL_CONSTASCII_USTRINGPARAM
(
"-"
));
...
@@ -66,7 +66,7 @@ sal_Bool readOption( OUString * pValue, const sal_Char * pOpt,
...
@@ -66,7 +66,7 @@ sal_Bool readOption( OUString * pValue, const sal_Char * pOpt,
++
(
*
pnIndex
);
++
(
*
pnIndex
);
rtl_getAppCommandArg
(
*
pnIndex
,
&
pValue
->
pData
);
rtl_getAppCommandArg
(
*
pnIndex
,
&
pValue
->
pData
);
if
(
*
pnIndex
>=
(
sal_Int32
)
rtl_getAppCommandArgCount
()
||
if
(
*
pnIndex
>=
rtl_getAppCommandArgCount
()
||
pValue
->
copy
(
1
).
equals
(
dash
))
pValue
->
copy
(
1
).
equals
(
dash
))
{
{
OUStringBuffer
buf
(
32
);
OUStringBuffer
buf
(
32
);
...
@@ -103,7 +103,7 @@ sal_Bool readOption( OUString * pValue, const sal_Char * pOpt,
...
@@ -103,7 +103,7 @@ sal_Bool readOption( OUString * pValue, const sal_Char * pOpt,
//-------------------------------------------------------------------------------
//-------------------------------------------------------------------------------
sal_Bool
readOption
(
sal_Bool
*
pbOpt
,
const
sal_Char
*
pOpt
,
sal_Bool
readOption
(
sal_Bool
*
pbOpt
,
const
sal_Char
*
pOpt
,
sal_Int32
*
pnIndex
,
const
OUString
&
aArg
)
sal_
u
Int32
*
pnIndex
,
const
OUString
&
aArg
)
{
{
const
OUString
dashdash
(
RTL_CONSTASCII_USTRINGPARAM
(
"--"
));
const
OUString
dashdash
(
RTL_CONSTASCII_USTRINGPARAM
(
"--"
));
const
OUString
dash
(
RTL_CONSTASCII_USTRINGPARAM
(
"-"
));
const
OUString
dash
(
RTL_CONSTASCII_USTRINGPARAM
(
"-"
));
...
...
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