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
e47d9069
Kaydet (Commit)
e47d9069
authored
Agu 18, 2013
tarafından
Matteo Casalin
Kaydeden (comit)
Caolán McNamara
Agu 20, 2013
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
String to OUString, better location for class method
Change-Id: Ifde0d45e35fed94d4ef6cb93b2feda172fd6608b
üst
e1a9a348
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
60 additions
and
38 deletions
+60
-38
SwRewriter.hxx
sw/inc/SwRewriter.hxx
+6
-4
SwRewriter.cxx
sw/source/core/undo/SwRewriter.cxx
+51
-1
undel.cxx
sw/source/core/undo/undel.cxx
+3
-33
No files found.
sw/inc/SwRewriter.hxx
Dosyayı görüntüle @
e47d9069
...
...
@@ -21,7 +21,7 @@
#define _SW_REWRITER_HXX
#include <vector>
#include <
tools/
string.hxx>
#include <
rtl/u
string.hxx>
#include <swdllapi.h>
enum
SwUndoArg
...
...
@@ -31,7 +31,7 @@ enum SwUndoArg
UndoArg3
};
typedef
std
::
pair
<
SwUndoArg
,
String
>
SwRewriteRule
;
typedef
std
::
pair
<
SwUndoArg
,
OU
String
>
SwRewriteRule
;
class
SW_DLLPUBLIC
SwRewriter
{
...
...
@@ -42,9 +42,11 @@ public:
SwRewriter
(
const
SwRewriter
&
rSrc
);
~
SwRewriter
();
void
AddRule
(
SwUndoArg
eWhat
,
const
String
&
rWith
);
void
AddRule
(
SwUndoArg
eWhat
,
const
OU
String
&
rWith
);
String
Apply
(
const
String
&
rStr
)
const
;
OUString
Apply
(
const
OUString
&
rStr
)
const
;
static
OUString
GetPlaceHolder
(
SwUndoArg
eId
);
};
#endif // _SW_REWRITER_HXX
...
...
sw/source/core/undo/SwRewriter.cxx
Dosyayı görüntüle @
e47d9069
...
...
@@ -41,7 +41,7 @@ SwRewriter::~SwRewriter()
{
}
void
SwRewriter
::
AddRule
(
SwUndoArg
eWhat
,
const
String
&
rWith
)
void
SwRewriter
::
AddRule
(
SwUndoArg
eWhat
,
const
OU
String
&
rWith
)
{
SwRewriteRule
aRule
(
eWhat
,
rWith
);
...
...
@@ -55,4 +55,54 @@ void SwRewriter::AddRule(SwUndoArg eWhat, const String & rWith)
mRules
.
push_back
(
aRule
);
}
namespace
{
const
char
UNDO_ARG1
[]
=
"$1"
;
const
char
UNDO_ARG2
[]
=
"$2"
;
const
char
UNDO_ARG3
[]
=
"$3"
;
}
OUString
SwRewriter
::
Apply
(
const
OUString
&
rStr
)
const
{
OUString
aResult
=
rStr
;
std
::
vector
<
SwRewriteRule
>::
const_iterator
aIt
;
for
(
aIt
=
mRules
.
begin
();
aIt
!=
mRules
.
end
();
++
aIt
)
{
switch
(
aIt
->
first
)
{
case
UndoArg1
:
default
:
aResult
=
aResult
.
replaceAll
(
UNDO_ARG1
,
aIt
->
second
);
break
;
case
UndoArg2
:
aResult
=
aResult
.
replaceAll
(
UNDO_ARG2
,
aIt
->
second
);
break
;
case
UndoArg3
:
aResult
=
aResult
.
replaceAll
(
UNDO_ARG3
,
aIt
->
second
);
break
;
}
}
return
aResult
;
}
OUString
SwRewriter
::
GetPlaceHolder
(
SwUndoArg
eId
)
{
switch
(
eId
)
{
case
UndoArg1
:
return
OUString
(
UNDO_ARG1
);
case
UndoArg2
:
return
OUString
(
UNDO_ARG2
);
case
UndoArg3
:
return
OUString
(
UNDO_ARG3
);
default
:
break
;
}
return
OUString
(
UNDO_ARG1
);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
sw/source/core/undo/undel.cxx
Dosyayı görüntüle @
e47d9069
...
...
@@ -552,10 +552,6 @@ static bool lcl_IsSpecialCharacter(sal_Unicode nChar)
return
false
;
}
const
char
UNDO_ARG1
[]
=
"$1"
;
const
char
UNDO_ARG2
[]
=
"$2"
;
const
char
UNDO_ARG3
[]
=
"$3"
;
static
String
lcl_DenotedPortion
(
String
rStr
,
xub_StrLen
nStart
,
xub_StrLen
nEnd
)
{
...
...
@@ -579,8 +575,7 @@ static String lcl_DenotedPortion(String rStr, xub_StrLen nStart,
case
CH_TXTATR_INWORD
:
case
CH_TXTATR_BREAKWORD
:
aResult
=
OUString
(
UNDO_ARG2
);
aResult
=
SwRewriter
::
GetPlaceHolder
(
UndoArg2
);
break
;
}
...
...
@@ -638,7 +633,7 @@ String DenoteSpecialCharacters(const String & rStr)
aResult
+=
lcl_DenotedPortion
(
rStr
,
nStart
,
rStr
.
Len
());
}
else
aResult
=
OUString
(
UNDO_ARG
2
);
aResult
=
SwRewriter
::
GetPlaceHolder
(
UndoArg
2
);
return
aResult
;
}
...
...
@@ -686,7 +681,7 @@ SwRewriter SwUndoDelete::GetRewriter() const
}
else
{
aStr
=
OUString
(
UNDO_ARG
2
);
aStr
=
SwRewriter
::
GetPlaceHolder
(
UndoArg
2
);
}
}
...
...
@@ -1082,29 +1077,4 @@ void SwUndoDelete::SetTableName(const String & rName)
sTableName
=
rName
;
}
String
SwRewriter
::
Apply
(
const
String
&
rStr
)
const
{
OUString
aResult
=
rStr
;
std
::
vector
<
SwRewriteRule
>::
const_iterator
aIt
;
for
(
aIt
=
mRules
.
begin
();
aIt
!=
mRules
.
end
();
++
aIt
)
{
switch
(
aIt
->
first
)
{
case
UndoArg1
:
default
:
aResult
=
aResult
.
replaceAll
(
UNDO_ARG1
,
aIt
->
second
);
break
;
case
UndoArg2
:
aResult
=
aResult
.
replaceAll
(
UNDO_ARG2
,
aIt
->
second
);
break
;
case
UndoArg3
:
aResult
=
aResult
.
replaceAll
(
UNDO_ARG3
,
aIt
->
second
);
break
;
}
}
return
aResult
;
}
/* 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