summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cui/source/options/optinet2.cxx12
-rw-r--r--cui/source/tabpages/autocdlg.cxx9
-rw-r--r--extensions/source/scanner/sanedlg.cxx2
-rw-r--r--forms/qa/integration/forms/ControlValidation.java4
-rw-r--r--forms/qa/integration/forms/ControlValidator.java2
-rw-r--r--forms/qa/integration/forms/DateValidator.java4
-rw-r--r--forms/qa/integration/forms/FormLayer.java4
-rw-r--r--forms/qa/integration/forms/ListSelectionValidator.java4
-rw-r--r--forms/qa/integration/forms/NumericValidator.java4
-rw-r--r--forms/qa/integration/forms/RadioButtons.java4
-rw-r--r--forms/qa/integration/forms/SingleControlValidation.java4
-rw-r--r--forms/qa/integration/forms/TextValidator.java4
-rw-r--r--forms/qa/integration/forms/TimeValidator.java4
13 files changed, 8 insertions, 53 deletions
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index dd252ba75890..6917a0d5229e 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -736,12 +736,12 @@ SfxTabPage* SvxSearchTabPage::Create(Window* pParent, const SfxItemSet& rAttrSet
void SvxSearchTabPage::Reset( const SfxItemSet& )
{
- //The two lines below are moved here from the last part of this method by BerryJia for fixing Bug102610 Time:2002-8-29 11:00 (China Standard Time GMT+08:00)
+ //The two lines below are moved here from the last part of this method
aChangePB.Disable();
aAddPB.Disable();
sal_uInt16 nCount = aSearchConfig.Count();
- aSearchLB.Clear(); //add by BerryJia for fixing Bug102610 Time:2002-8-29 11:00 (China Standard Time GMT+08:00)
+ aSearchLB.Clear();
for(sal_uInt16 i = 0; i < nCount; i++)
{
const SvxSearchEngineData& rData = aSearchConfig.GetData(i);
@@ -775,7 +775,6 @@ void SvxSearchTabPage::ActivatePage( const SfxItemSet& )
int SvxSearchTabPage::DeactivatePage( SfxItemSet* _pSet )
{
- //Modified by BerryJia for fixing Bug102610 Time:2002-8-29 11:00 (China Standard Time GMT+08:00)
if(!ConfirmLeave(String()))
return KEEP_PAGE;
@@ -786,7 +785,6 @@ int SvxSearchTabPage::DeactivatePage( SfxItemSet* _pSet )
// -----------------------------------------------------------------------
-//add by BerryJia for fixing Bug102610 Time:2002-8-29 11:00 (China Standard Time GMT+08:00)
BOOL SvxSearchTabPage::ConfirmLeave( const String& rStringSelection)
{
if(aChangePB.IsEnabled())
@@ -893,7 +891,6 @@ void SvxSearchTabPage::InitControls_Impl()
IMPL_LINK( SvxSearchTabPage, NewSearchHdl_Impl, PushButton *, EMPTYARG )
{
- //The 3 lines below is modified by BerryJia for fixing Bug102610 Time:2002-8-29 11:00 (China Standard Time GMT+08:00)
SearchEntryHdl_Impl(&aSearchLB);
if(aChangePB.IsEnabled() || aAddPB.IsEnabled())
return 0;
@@ -910,7 +907,6 @@ IMPL_LINK( SvxSearchTabPage, NewSearchHdl_Impl, PushButton *, EMPTYARG )
IMPL_LINK( SvxSearchTabPage, AddSearchHdl_Impl, PushButton *, EMPTYARG )
{
- //The following two lines is added by BerryJia for fixing Bug102610 Time:2002-8-29 11:00 (China Standard Time GMT+08:00)
aAddPB.Enable(FALSE);
aChangePB.Enable(FALSE);
aCurrentSrchData.sEngineName = aSearchNameED.GetText();
@@ -925,7 +921,6 @@ IMPL_LINK( SvxSearchTabPage, AddSearchHdl_Impl, PushButton *, EMPTYARG )
IMPL_LINK( SvxSearchTabPage, ChangeSearchHdl_Impl, PushButton *, EMPTYARG )
{
- //The following two lines is added by BerryJia for fixing Bug102610 Time:2002-8-29 11:00 (China Standard Time GMT+08:00)
aChangePB.Enable(FALSE);
aAddPB.Enable(FALSE);
USHORT nPos = aSearchLB.GetSelectEntryPos();
@@ -957,7 +952,7 @@ IMPL_LINK( SvxSearchTabPage, ChangeSearchHdl_Impl, PushButton *, EMPTYARG )
IMPL_LINK( SvxSearchTabPage, DeleteSearchHdl_Impl, PushButton *, EMPTYARG)
{
- aChangePB.Enable(FALSE); //add by BerryJia for fixing Bug102610 Time:2002-8-29 11:00 (China Standard Time GMT+08:00)
+ aChangePB.Enable(FALSE);
USHORT nPos = aSearchLB.GetSelectEntryPos();
DBG_ASSERT(nPos != LISTBOX_ENTRY_NOTFOUND, "kein Eintrag selektiert!");
aSearchConfig.RemoveData(aSearchLB.GetSelectEntry());
@@ -975,7 +970,6 @@ IMPL_LINK( SvxSearchTabPage, SearchEntryHdl_Impl, ListBox*, pBox )
if ( nEntryPos != LISTBOX_ENTRY_NOTFOUND )
{
String sSelection(pBox->GetSelectEntry());
- //Modified by BerryJia for fixing Bug102610 Time:2002-8-29 11:00 (China Standard Time GMT+08:00)
if(!ConfirmLeave(sSelection))
return 0;
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 04583b55b0fb..fd68e1e1f557 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -2125,7 +2125,6 @@ IMPL_LINK( OfaQuoteTabPage, QuoteHdl, PushButton*, pBtn )
LANGUAGE_ENGLISH_US, DEFAULTFONT_FLAGS_ONLYONE, 0 ));
pMap->SetText(nMode < SGL_END ? sStartQuoteDlg : sEndQuoteDlg );
sal_UCS4 cDlg;
- //The two lines below are added by BerryJia for Bug95846 Time:2002-8-13 15:50
SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get()->GetAutoCorrect();
LanguageType eLang = Application::GetSettings().GetLanguage();
switch( nMode )
@@ -2133,22 +2132,22 @@ IMPL_LINK( OfaQuoteTabPage, QuoteHdl, PushButton*, pBtn )
case SGL_START:
cDlg = cSglStartQuote;
if(cDlg == 0)
- cDlg = pAutoCorrect->GetQuote('\'',TRUE,eLang); //add by BerryJia for Bug95846 Time:2002-8-13 15:50
+ cDlg = pAutoCorrect->GetQuote('\'',TRUE,eLang);
break;
case SGL_END:
cDlg = cSglEndQuote;
if(cDlg == 0)
- cDlg = pAutoCorrect->GetQuote('\'',FALSE,eLang); //add by BerryJia for Bug95846 Time:2002-8-13 15:50
+ cDlg = pAutoCorrect->GetQuote('\'',FALSE,eLang);
break;
case DBL_START:
cDlg = cStartQuote;
if(cDlg == 0)
- cDlg = pAutoCorrect->GetQuote('\"',TRUE,eLang); //add by BerryJia for Bug95846 Time:2002-8-13 15:50
+ cDlg = pAutoCorrect->GetQuote('\"',TRUE,eLang);
break;
case DBL_END:
cDlg = cEndQuote;
if(cDlg == 0)
- cDlg = pAutoCorrect->GetQuote('\"',FALSE,eLang); //add by BerryJia for Bug95846 Time:2002-8-13 15:50
+ cDlg = pAutoCorrect->GetQuote('\"',FALSE,eLang);
break;
default:
OSL_FAIL("svx::OfaQuoteTabPage::QuoteHdl(), how to initialize cDlg?" );
diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx
index 25dd1d7e3f2a..2145a6c371ea 100644
--- a/extensions/source/scanner/sanedlg.cxx
+++ b/extensions/source/scanner/sanedlg.cxx
@@ -221,7 +221,7 @@ void SaneDlg::InitFields()
maReslBox.SetMin( (long)pDouble[0] );
maReslBox.SetMax( (long)pDouble[1] );
maReslBox.InsertValue( (long)pDouble[0] );
- // mh@openoffice.org: issue 68557: Can only select 75 and 2400 dpi in Scanner dialogue
+ // Can only select 75 and 2400 dpi in Scanner dialogue
// scanner allows random setting of dpi resolution, a slider might be useful
// support that
// workaround: offer at least some more standard dpi resolution between
diff --git a/forms/qa/integration/forms/ControlValidation.java b/forms/qa/integration/forms/ControlValidation.java
index c480ded16a4b..39d5ed6a2d61 100644
--- a/forms/qa/integration/forms/ControlValidation.java
+++ b/forms/qa/integration/forms/ControlValidation.java
@@ -42,10 +42,6 @@ import integration.forms.BooleanValidator;
import integration.forms.ListSelectionValidator;
import integration.forms.SingleControlValidation;
-/**
- *
- * @author fs@openoffice.org
- */
public class ControlValidation extends complexlib.ComplexTestCase implements com.sun.star.lang.XEventListener
{
private DocumentHelper m_document; /// our current test document
diff --git a/forms/qa/integration/forms/ControlValidator.java b/forms/qa/integration/forms/ControlValidator.java
index 969a9d2f46aa..0f3fad832cb4 100644
--- a/forms/qa/integration/forms/ControlValidator.java
+++ b/forms/qa/integration/forms/ControlValidator.java
@@ -27,8 +27,6 @@
package integration.forms;
/** base class for components validating the content of form controls
- *
- * @author fs@openoffice.org
*/
public abstract class ControlValidator implements com.sun.star.form.validation.XValidator
{
diff --git a/forms/qa/integration/forms/DateValidator.java b/forms/qa/integration/forms/DateValidator.java
index 1ae2bbe48058..e0511f2218f0 100644
--- a/forms/qa/integration/forms/DateValidator.java
+++ b/forms/qa/integration/forms/DateValidator.java
@@ -28,10 +28,6 @@ package integration.forms;
import com.sun.star.form.binding.*;
-/**
- *
- * @author fs@openoffice.org
- */
public class DateValidator extends integration.forms.ControlValidator
{
diff --git a/forms/qa/integration/forms/FormLayer.java b/forms/qa/integration/forms/FormLayer.java
index d1b50f0d246c..3897590c4701 100644
--- a/forms/qa/integration/forms/FormLayer.java
+++ b/forms/qa/integration/forms/FormLayer.java
@@ -44,10 +44,6 @@ import com.sun.star.container.XNameAccess;
import com.sun.star.text.TextContentAnchorType;
import com.sun.star.drawing.XDrawPage;
-/**
- *
- * @author fs@openoffice.org
- */
public class FormLayer
{
private DocumentHelper m_document;
diff --git a/forms/qa/integration/forms/ListSelectionValidator.java b/forms/qa/integration/forms/ListSelectionValidator.java
index 4f25b162712d..82950213a14b 100644
--- a/forms/qa/integration/forms/ListSelectionValidator.java
+++ b/forms/qa/integration/forms/ListSelectionValidator.java
@@ -27,10 +27,6 @@
package integration.forms;
-/**
- *
- * @author fs@openoffice.org
- */
public class ListSelectionValidator extends integration.forms.ControlValidator
{
/** Creates a new instance of ListSelectionValidator */
diff --git a/forms/qa/integration/forms/NumericValidator.java b/forms/qa/integration/forms/NumericValidator.java
index 4fed12c4fd2b..e3014a9c5113 100644
--- a/forms/qa/integration/forms/NumericValidator.java
+++ b/forms/qa/integration/forms/NumericValidator.java
@@ -28,10 +28,6 @@ package integration.forms;
import com.sun.star.form.binding.*;
-/**
- *
- * @author fs@openoffice.org
- */
public class NumericValidator extends integration.forms.ControlValidator
{
diff --git a/forms/qa/integration/forms/RadioButtons.java b/forms/qa/integration/forms/RadioButtons.java
index 3ce02787b330..b6d98dc22d07 100644
--- a/forms/qa/integration/forms/RadioButtons.java
+++ b/forms/qa/integration/forms/RadioButtons.java
@@ -42,10 +42,6 @@ import java.util.*;
import java.io.*;
import java.lang.*;
-/**
- *
- * @author fs@openoffice.org
- */
public class RadioButtons extends complexlib.ComplexTestCase
{
private DocumentHelper m_document; /// our current test document
diff --git a/forms/qa/integration/forms/SingleControlValidation.java b/forms/qa/integration/forms/SingleControlValidation.java
index 637e9c9e4e26..2f7d0e13f41a 100644
--- a/forms/qa/integration/forms/SingleControlValidation.java
+++ b/forms/qa/integration/forms/SingleControlValidation.java
@@ -38,10 +38,6 @@ import com.sun.star.form.validation.*;
import integration.forms.DocumentHelper;
-/**
- *
- * @author fs@openoffice.org
- */
public class SingleControlValidation implements XFormComponentValidityListener
{
private DocumentHelper m_document; /// our current test document
diff --git a/forms/qa/integration/forms/TextValidator.java b/forms/qa/integration/forms/TextValidator.java
index db340f93abcc..c1b2fc45c070 100644
--- a/forms/qa/integration/forms/TextValidator.java
+++ b/forms/qa/integration/forms/TextValidator.java
@@ -28,10 +28,6 @@ package integration.forms;
import com.sun.star.form.binding.*;
-/**
- *
- * @author fs@openoffice.org
- */
public class TextValidator extends integration.forms.ControlValidator
{
diff --git a/forms/qa/integration/forms/TimeValidator.java b/forms/qa/integration/forms/TimeValidator.java
index 116f98455d94..4ca1ca74083d 100644
--- a/forms/qa/integration/forms/TimeValidator.java
+++ b/forms/qa/integration/forms/TimeValidator.java
@@ -28,10 +28,6 @@ package integration.forms;
import com.sun.star.form.binding.*;
-/**
- *
- * @author fs@openoffice.org
- */
public class TimeValidator extends integration.forms.ControlValidator
{